From 23cb333da1077bf7f70f093719304c493b60fc98 Mon Sep 17 00:00:00 2001 From: Lukas Kraus Date: Tue, 3 Dec 2024 09:18:29 +0000 Subject: [PATCH 1/6] Add cc-rrze Signed-off-by: Lukas Kraus --- .zuul.d/secure.yaml | 22 +++++++++++++++++++++ Tests/config.toml | 1 + compliance-monitor/bootstrap.yaml | 3 +++ compliance-monitor/templates/overview.md.j2 | 1 + playbooks/clouds.yaml.j2 | 9 +++++++++ 5 files changed, 36 insertions(+) diff --git a/.zuul.d/secure.yaml b/.zuul.d/secure.yaml index 78dbb906f..aa44d5001 100644 --- a/.zuul.d/secure.yaml +++ b/.zuul.d/secure.yaml @@ -321,3 +321,25 @@ wzWYpJQQ6gehh3OTs5i9fLetoaQ59HF01SVDQL44VKT3xi4P5Wr9u+hLCbGDeu+OMPNGM UYLHSWwKv893lov4K6/e4jz00EikV17kd+tVW1qMKMRFxdrRgwKP+wr50do2zVxhBMu4H Co5I7CeK4GeN3KURGCKfcm/IRm+8A9j1+ocJelQf4T5DZtUlLrkGBe2SGw/V2I= + cc-rrze_ac_id: !encrypted/pkcs1-oaep + - DUgJ7ozJOzJq1TSmBE6P8RGAW6C+s9LDRbW6mHIbAQlAX3+21d/KgoLk9zEyDdOanK1yd + QaEZJDjURsIAcHJh7vh9w/2Z948XKDybxIOb1tcJGJU1LsEmYoNAQXM5G3+l8Z66Crpgw + RE+wBlSe1dhXrhiGefH2ykvbRtPggJMFECpy+rVg16GhGSlnzptVk4F2GEGpzkEx84B0J + 0h/HdX/y40xoeBx6giVZrZsOGnvWmMLqIq5Q5NMa1hdY0yGbpAUruqFrkVYZGU59ygEuo + 60mJD0R1wQOo14wZtXob67V0DO9AcdRJHZRDRKyclPyGkf/QbCBf8+DCqAd/BKbe9a818 + Z7M8aeylvO/digVAqJa5zin3vOz5PJUGkv0GZjjcgGkwV+d/7pWwebBsXNjBKj9HgX3Xe + eU6ZmfIJHb3pB4X+RySTIFAjp60Tb6QLe7yE1aJ5Ffc8ZsGqLhYcH0Q+SWhh3A6EJirRY + T76Ufw5n04L7GT+nP1Cy6Lf2eSPvJCto9y5iSfnayyssWmkDmcgrYVJXhktuR6Gy6sTQu + 0+s9ynznFVG0PVexLZVo7fCmcFydGHeoupCj0kHIc46hCMogEQI7CI+462jS5Rznhs+2J + cK5NYc1gl6woxeJq3fwITw0eGK+zqrUMsBAV1FKrgfkYuFydRA/JRQSd3+vEOI= + cc-rrze_ac_secret: !encrypted/pkcs1-oaep + - pW3PjqBbzTNc3PfESczT4DXlk1mfiC6PMqkLidggcVRawlEy/UT7Dmynjr+lvkJz6oHIo + vnfnviKW7t6VqUgv5h4rRbh3PaCJqrCL35X7hW1uJSvyOgq3he836+78W23j/JhyO/gKk + 9okn31np0uWguiIueCXjIgfkq2M/rJ3Aq//6siT/BKGmUupu6J7lskd47IHsOFV6oVT/t + MT+QrOJEP1KDlIiwbQsoiX9r+39/RR2qvhxMCW5Bh068TJI206oKPmJcR5doDBgygOhhj + HFwmox9X6F4jR1uDLAjxzdX7pC/JHaYGEe4rBYJ+RB4HKAH+4p7Fvy152quDkUsQPmJjn + ivRk6eR9/NrMPpljsvdIs9J/dPsdbCmM55rnGvo+BBh2lA7LrNzgcAHQ8se1UozaTzzlC + AIiZRchy6ivAucQEJv7iKXRgR2YLq4yO3GYOmY0bcGkE+K2Envuq1mz1Dt874Rc4FyGSN + diK3gdP7uWp0nVp4BXCXIygscdQe/rMCgrVSFV3l6EEz+nuaZM0AodkPccjuPdFnxainq + JQEGmPnox+w8UgMNpR3BSIY3qZpEsIrOejX/L0tM4+z1mozdSnhajJV4dkj8xYreJKQJC + lwpQQDNBIyjwvq6GJjreu0ZEWdwBAYmodhaH8odgd/cpctXB/tuzqgpnEwQt2E= diff --git a/Tests/config.toml b/Tests/config.toml index 6b7a5c71f..d1cebf0c4 100644 --- a/Tests/config.toml +++ b/Tests/config.toml @@ -30,6 +30,7 @@ subjects = [ "syseleven-dus2", "syseleven-ham1", "wavestack", + "cc-rrze", ] workers = 4 diff --git a/compliance-monitor/bootstrap.yaml b/compliance-monitor/bootstrap.yaml index 8339c422d..a6201e89f 100644 --- a/compliance-monitor/bootstrap.yaml +++ b/compliance-monitor/bootstrap.yaml @@ -66,3 +66,6 @@ accounts: - public_key: "AAAAC3NzaC1lZDI1NTE5AAAAILufk4C7e0eQQIkmUDK8GB2IoiDjYtv6mx2eE8wZ3VWT" public_key_type: "ssh-ed25519" public_key_name: "primary" + - subject: cc-rrze + delegates: + - zuul_ci diff --git a/compliance-monitor/templates/overview.md.j2 b/compliance-monitor/templates/overview.md.j2 index 77ba6bcc9..46d5f3ba1 100644 --- a/compliance-monitor/templates/overview.md.j2 +++ b/compliance-monitor/templates/overview.md.j2 @@ -46,3 +46,4 @@ Version numbers are suffixed by a symbol depending on state: * for _draft_, † | [Wavestack](https://www.noris.de/wavestack-cloud/) | Public cloud for customers | noris network AG/Wavecon GmbH | {#- #} [{{ results | pick('wavestack', iaas) | summary }}]({{ detail_url('wavestack', iaas) }}) {# -#} | [HM](https://health.wavestack1.sovereignit.cloud:3000/) | +| [CC@RRZE](https://www.rrze.fau.de/) | Private Compute Cloud (CC) for [FAU](https://www.fau.de/) | Regionales Rechenzentrum Erlangen | {#- #} [{{ results | pick('cc-rrze', iaas) | summary }}]({{ detail_url('cc-rrze', iaas) }}) {# -#} | (tba) | diff --git a/playbooks/clouds.yaml.j2 b/playbooks/clouds.yaml.j2 index 2df1cdbd8..3479ce963 100644 --- a/playbooks/clouds.yaml.j2 +++ b/playbooks/clouds.yaml.j2 @@ -119,3 +119,12 @@ clouds: application_credential_id: "{{ clouds_conf.wavestack_ac_id }}" application_credential_secret: "{{ clouds_conf.wavestack_ac_secret }}" auth_type: "v3applicationcredential" + cc-rrze: + region_name: "DE-ERL" + interface: "public" + identity_api_version: 3 + auth_type: "v3applicationcredential" + auth: + auth_url: AUTH_URL + application_credential_id: "{{ clouds_conf.cc-rrze_ac_id }}" + application_credential_secret: "{{ clouds_conf.cc-rrze_a_ac_secret }}" From 8c50ef4c968c55ab3c0564bd4482c7b992c8deb7 Mon Sep 17 00:00:00 2001 From: Lukas Kraus Date: Tue, 3 Dec 2024 10:52:44 +0000 Subject: [PATCH 2/6] Fixed auth_url --- playbooks/clouds.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/clouds.yaml.j2 b/playbooks/clouds.yaml.j2 index 3479ce963..bcab92746 100644 --- a/playbooks/clouds.yaml.j2 +++ b/playbooks/clouds.yaml.j2 @@ -125,6 +125,6 @@ clouds: identity_api_version: 3 auth_type: "v3applicationcredential" auth: - auth_url: AUTH_URL + auth_url: https://api.cc.rrze.de:5000 application_credential_id: "{{ clouds_conf.cc-rrze_ac_id }}" application_credential_secret: "{{ clouds_conf.cc-rrze_a_ac_secret }}" From d822cf30c72b60295339fe3bf4c05ad5e34d38c5 Mon Sep 17 00:00:00 2001 From: Lukas Kraus Date: Tue, 3 Dec 2024 10:57:16 +0000 Subject: [PATCH 3/6] added for manual feed of reports --- compliance-monitor/bootstrap.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compliance-monitor/bootstrap.yaml b/compliance-monitor/bootstrap.yaml index a6201e89f..2889e8ca0 100644 --- a/compliance-monitor/bootstrap.yaml +++ b/compliance-monitor/bootstrap.yaml @@ -69,3 +69,9 @@ accounts: - subject: cc-rrze delegates: - zuul_ci + api_keys: + - "$argon2id$v=19$m=65536,t=3,p=4$iLG29t7be88ZY6w1Rui91w$9UwkTMLBMxq/1QyeVfJcc95fhQtY1AC48Rex4S8ZSIU" + keys: + - public_key: "AAAAC3NzaC1lZDI1NTE5AAAAIF8kQx6ur/WSSY9ThK/mwhrl/VsYnjRk44GSXBy3VfKI" + public_key_type: "ssh-ed25519" + public_key_name: "primary From e09fe1303ae19ba4d493410751f38b8d41ff05d0 Mon Sep 17 00:00:00 2001 From: Lukas Kraus Date: Mon, 9 Dec 2024 08:00:30 +0000 Subject: [PATCH 4/6] Fixed alphabetical order Signed-off-by: Lukas Kraus --- compliance-monitor/templates/overview.md.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compliance-monitor/templates/overview.md.j2 b/compliance-monitor/templates/overview.md.j2 index 46d5f3ba1..bf3fd3008 100644 --- a/compliance-monitor/templates/overview.md.j2 +++ b/compliance-monitor/templates/overview.md.j2 @@ -14,6 +14,7 @@ Version numbers are suffixed by a symbol depending on state: * for _draft_, † | [aov.cloud](https://www.aov.de/) | Community cloud for customers | aov IT.Services GmbH | {#- #} [{{ results | pick('aov', iaas) | summary }}]({{ detail_url('aov', iaas) }}) {# -#} | [HM](https://health.aov.cloud/) | +| [CC@RRZE](https://www.rrze.fau.de/) | Private Compute Cloud (CC) for [FAU](https://www.fau.de/) | Regionales Rechenzentrum Erlangen | {#- #} [{{ results | pick('cc-rrze', iaas) | summary }}]({{ detail_url('cc-rrze', iaas) }}) {# -#} | (soon) | | [CNDS](https://cnds.io/) | Public cloud for customers | artcodix GmbH | {#- #} [{{ results | pick('artcodix', iaas) | summary }}]({{ detail_url('artcodix', iaas) }}) {# -#} | [HM](https://ohm.muc.cloud.cnds.io/) | @@ -46,4 +47,3 @@ Version numbers are suffixed by a symbol depending on state: * for _draft_, † | [Wavestack](https://www.noris.de/wavestack-cloud/) | Public cloud for customers | noris network AG/Wavecon GmbH | {#- #} [{{ results | pick('wavestack', iaas) | summary }}]({{ detail_url('wavestack', iaas) }}) {# -#} | [HM](https://health.wavestack1.sovereignit.cloud:3000/) | -| [CC@RRZE](https://www.rrze.fau.de/) | Private Compute Cloud (CC) for [FAU](https://www.fau.de/) | Regionales Rechenzentrum Erlangen | {#- #} [{{ results | pick('cc-rrze', iaas) | summary }}]({{ detail_url('cc-rrze', iaas) }}) {# -#} | (tba) | From 720fd7f81d8d9613eb1f1244658e894a64a9ace0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCchse?= Date: Tue, 10 Dec 2024 09:02:48 +0100 Subject: [PATCH 5/6] Fix sort order and other minor issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matthias Büchse --- .zuul.d/secure.yaml | 44 ++++++++++----------- Tests/config.toml | 2 +- compliance-monitor/bootstrap.yaml | 18 ++++----- compliance-monitor/templates/overview.md.j2 | 4 +- playbooks/clouds.yaml.j2 | 18 ++++----- 5 files changed, 44 insertions(+), 42 deletions(-) diff --git a/.zuul.d/secure.yaml b/.zuul.d/secure.yaml index aa44d5001..737448d4b 100644 --- a/.zuul.d/secure.yaml +++ b/.zuul.d/secure.yaml @@ -57,6 +57,28 @@ Vjo5fBpIjEOLNtA40vx0Agx1Red2eMFA5oLcxiDMBSP4nLiI1QNROSnGc7GYoIT5kyq8k P5Uw261H4un2xvpO9ZBuHEV5mskTiBazTPDwaqU3yZoyGIvdQl2Uo6S3Glnf41YH+k/hN jxzziQB9sT2glnmmzrzZ22xPZg+sTngWS/3svRYV9BXKnMgq8jjR6eIKGYSwyQ= + cc_rrze_ac_id: !encrypted/pkcs1-oaep + - DUgJ7ozJOzJq1TSmBE6P8RGAW6C+s9LDRbW6mHIbAQlAX3+21d/KgoLk9zEyDdOanK1yd + QaEZJDjURsIAcHJh7vh9w/2Z948XKDybxIOb1tcJGJU1LsEmYoNAQXM5G3+l8Z66Crpgw + RE+wBlSe1dhXrhiGefH2ykvbRtPggJMFECpy+rVg16GhGSlnzptVk4F2GEGpzkEx84B0J + 0h/HdX/y40xoeBx6giVZrZsOGnvWmMLqIq5Q5NMa1hdY0yGbpAUruqFrkVYZGU59ygEuo + 60mJD0R1wQOo14wZtXob67V0DO9AcdRJHZRDRKyclPyGkf/QbCBf8+DCqAd/BKbe9a818 + Z7M8aeylvO/digVAqJa5zin3vOz5PJUGkv0GZjjcgGkwV+d/7pWwebBsXNjBKj9HgX3Xe + eU6ZmfIJHb3pB4X+RySTIFAjp60Tb6QLe7yE1aJ5Ffc8ZsGqLhYcH0Q+SWhh3A6EJirRY + T76Ufw5n04L7GT+nP1Cy6Lf2eSPvJCto9y5iSfnayyssWmkDmcgrYVJXhktuR6Gy6sTQu + 0+s9ynznFVG0PVexLZVo7fCmcFydGHeoupCj0kHIc46hCMogEQI7CI+462jS5Rznhs+2J + cK5NYc1gl6woxeJq3fwITw0eGK+zqrUMsBAV1FKrgfkYuFydRA/JRQSd3+vEOI= + cc_rrze_ac_secret: !encrypted/pkcs1-oaep + - pW3PjqBbzTNc3PfESczT4DXlk1mfiC6PMqkLidggcVRawlEy/UT7Dmynjr+lvkJz6oHIo + vnfnviKW7t6VqUgv5h4rRbh3PaCJqrCL35X7hW1uJSvyOgq3he836+78W23j/JhyO/gKk + 9okn31np0uWguiIueCXjIgfkq2M/rJ3Aq//6siT/BKGmUupu6J7lskd47IHsOFV6oVT/t + MT+QrOJEP1KDlIiwbQsoiX9r+39/RR2qvhxMCW5Bh068TJI206oKPmJcR5doDBgygOhhj + HFwmox9X6F4jR1uDLAjxzdX7pC/JHaYGEe4rBYJ+RB4HKAH+4p7Fvy152quDkUsQPmJjn + ivRk6eR9/NrMPpljsvdIs9J/dPsdbCmM55rnGvo+BBh2lA7LrNzgcAHQ8se1UozaTzzlC + AIiZRchy6ivAucQEJv7iKXRgR2YLq4yO3GYOmY0bcGkE+K2Envuq1mz1Dt874Rc4FyGSN + diK3gdP7uWp0nVp4BXCXIygscdQe/rMCgrVSFV3l6EEz+nuaZM0AodkPccjuPdFnxainq + JQEGmPnox+w8UgMNpR3BSIY3qZpEsIrOejX/L0tM4+z1mozdSnhajJV4dkj8xYreJKQJC + lwpQQDNBIyjwvq6GJjreu0ZEWdwBAYmodhaH8odgd/cpctXB/tuzqgpnEwQt2E= cnds_ac_id: !encrypted/pkcs1-oaep - apArEei+9Eu0NrelesebDZwUjGvbep58dAQowtcCEn1hzbUAqMxWm74Ibk1e+C3prH5Zv tcj+okUoyfelP8ExqCZL55cOZVentoyg/VfiwZlR1z9N/p3vDkN3sx8z6o7CJux2oFMkg @@ -321,25 +343,3 @@ wzWYpJQQ6gehh3OTs5i9fLetoaQ59HF01SVDQL44VKT3xi4P5Wr9u+hLCbGDeu+OMPNGM UYLHSWwKv893lov4K6/e4jz00EikV17kd+tVW1qMKMRFxdrRgwKP+wr50do2zVxhBMu4H Co5I7CeK4GeN3KURGCKfcm/IRm+8A9j1+ocJelQf4T5DZtUlLrkGBe2SGw/V2I= - cc-rrze_ac_id: !encrypted/pkcs1-oaep - - DUgJ7ozJOzJq1TSmBE6P8RGAW6C+s9LDRbW6mHIbAQlAX3+21d/KgoLk9zEyDdOanK1yd - QaEZJDjURsIAcHJh7vh9w/2Z948XKDybxIOb1tcJGJU1LsEmYoNAQXM5G3+l8Z66Crpgw - RE+wBlSe1dhXrhiGefH2ykvbRtPggJMFECpy+rVg16GhGSlnzptVk4F2GEGpzkEx84B0J - 0h/HdX/y40xoeBx6giVZrZsOGnvWmMLqIq5Q5NMa1hdY0yGbpAUruqFrkVYZGU59ygEuo - 60mJD0R1wQOo14wZtXob67V0DO9AcdRJHZRDRKyclPyGkf/QbCBf8+DCqAd/BKbe9a818 - Z7M8aeylvO/digVAqJa5zin3vOz5PJUGkv0GZjjcgGkwV+d/7pWwebBsXNjBKj9HgX3Xe - eU6ZmfIJHb3pB4X+RySTIFAjp60Tb6QLe7yE1aJ5Ffc8ZsGqLhYcH0Q+SWhh3A6EJirRY - T76Ufw5n04L7GT+nP1Cy6Lf2eSPvJCto9y5iSfnayyssWmkDmcgrYVJXhktuR6Gy6sTQu - 0+s9ynznFVG0PVexLZVo7fCmcFydGHeoupCj0kHIc46hCMogEQI7CI+462jS5Rznhs+2J - cK5NYc1gl6woxeJq3fwITw0eGK+zqrUMsBAV1FKrgfkYuFydRA/JRQSd3+vEOI= - cc-rrze_ac_secret: !encrypted/pkcs1-oaep - - pW3PjqBbzTNc3PfESczT4DXlk1mfiC6PMqkLidggcVRawlEy/UT7Dmynjr+lvkJz6oHIo - vnfnviKW7t6VqUgv5h4rRbh3PaCJqrCL35X7hW1uJSvyOgq3he836+78W23j/JhyO/gKk - 9okn31np0uWguiIueCXjIgfkq2M/rJ3Aq//6siT/BKGmUupu6J7lskd47IHsOFV6oVT/t - MT+QrOJEP1KDlIiwbQsoiX9r+39/RR2qvhxMCW5Bh068TJI206oKPmJcR5doDBgygOhhj - HFwmox9X6F4jR1uDLAjxzdX7pC/JHaYGEe4rBYJ+RB4HKAH+4p7Fvy152quDkUsQPmJjn - ivRk6eR9/NrMPpljsvdIs9J/dPsdbCmM55rnGvo+BBh2lA7LrNzgcAHQ8se1UozaTzzlC - AIiZRchy6ivAucQEJv7iKXRgR2YLq4yO3GYOmY0bcGkE+K2Envuq1mz1Dt874Rc4FyGSN - diK3gdP7uWp0nVp4BXCXIygscdQe/rMCgrVSFV3l6EEz+nuaZM0AodkPccjuPdFnxainq - JQEGmPnox+w8UgMNpR3BSIY3qZpEsIrOejX/L0tM4+z1mozdSnhajJV4dkj8xYreJKQJC - lwpQQDNBIyjwvq6GJjreu0ZEWdwBAYmodhaH8odgd/cpctXB/tuzqgpnEwQt2E= diff --git a/Tests/config.toml b/Tests/config.toml index d1cebf0c4..69c17d239 100644 --- a/Tests/config.toml +++ b/Tests/config.toml @@ -19,6 +19,7 @@ scopes = [ subjects = [ "gx-scs", "artcodix", + "cc-rrze", "pco-prod1", "pco-prod2", "pco-prod3", @@ -30,7 +31,6 @@ subjects = [ "syseleven-dus2", "syseleven-ham1", "wavestack", - "cc-rrze", ] workers = 4 diff --git a/compliance-monitor/bootstrap.yaml b/compliance-monitor/bootstrap.yaml index 2889e8ca0..935cc8ca7 100644 --- a/compliance-monitor/bootstrap.yaml +++ b/compliance-monitor/bootstrap.yaml @@ -25,6 +25,15 @@ accounts: - subject: artcodix delegates: - zuul_ci + - subject: cc-rrze + delegates: + - zuul_ci + api_keys: + - "$argon2id$v=19$m=65536,t=3,p=4$iLG29t7be88ZY6w1Rui91w$9UwkTMLBMxq/1QyeVfJcc95fhQtY1AC48Rex4S8ZSIU" + keys: + - public_key: "AAAAC3NzaC1lZDI1NTE5AAAAIF8kQx6ur/WSSY9ThK/mwhrl/VsYnjRk44GSXBy3VfKI" + public_key_type: "ssh-ed25519" + public_key_name: "primary - subject: pco-prod1 delegates: - zuul_ci @@ -66,12 +75,3 @@ accounts: - public_key: "AAAAC3NzaC1lZDI1NTE5AAAAILufk4C7e0eQQIkmUDK8GB2IoiDjYtv6mx2eE8wZ3VWT" public_key_type: "ssh-ed25519" public_key_name: "primary" - - subject: cc-rrze - delegates: - - zuul_ci - api_keys: - - "$argon2id$v=19$m=65536,t=3,p=4$iLG29t7be88ZY6w1Rui91w$9UwkTMLBMxq/1QyeVfJcc95fhQtY1AC48Rex4S8ZSIU" - keys: - - public_key: "AAAAC3NzaC1lZDI1NTE5AAAAIF8kQx6ur/WSSY9ThK/mwhrl/VsYnjRk44GSXBy3VfKI" - public_key_type: "ssh-ed25519" - public_key_name: "primary diff --git a/compliance-monitor/templates/overview.md.j2 b/compliance-monitor/templates/overview.md.j2 index bf3fd3008..a1f42ade2 100644 --- a/compliance-monitor/templates/overview.md.j2 +++ b/compliance-monitor/templates/overview.md.j2 @@ -14,7 +14,9 @@ Version numbers are suffixed by a symbol depending on state: * for _draft_, † | [aov.cloud](https://www.aov.de/) | Community cloud for customers | aov IT.Services GmbH | {#- #} [{{ results | pick('aov', iaas) | summary }}]({{ detail_url('aov', iaas) }}) {# -#} | [HM](https://health.aov.cloud/) | -| [CC@RRZE](https://www.rrze.fau.de/) | Private Compute Cloud (CC) for [FAU](https://www.fau.de/) | Regionales Rechenzentrum Erlangen | {#- #} [{{ results | pick('cc-rrze', iaas) | summary }}]({{ detail_url('cc-rrze', iaas) }}) {# -#} | (soon) | +| [CC@RRZE](https://www.rrze.fau.de/) | Private Compute Cloud (CC) for [FAU](https://www.fau.de/) | Regionales Rechenzentrum Erlangen | +{#- #} [{{ results | pick('cc-rrze', iaas) | summary }}]({{ detail_url('cc-rrze', iaas) }}) {# -#} +| (soon) | | [CNDS](https://cnds.io/) | Public cloud for customers | artcodix GmbH | {#- #} [{{ results | pick('artcodix', iaas) | summary }}]({{ detail_url('artcodix', iaas) }}) {# -#} | [HM](https://ohm.muc.cloud.cnds.io/) | diff --git a/playbooks/clouds.yaml.j2 b/playbooks/clouds.yaml.j2 index bcab92746..b6906c667 100644 --- a/playbooks/clouds.yaml.j2 +++ b/playbooks/clouds.yaml.j2 @@ -19,6 +19,15 @@ clouds: application_credential_id: "{{ clouds_conf.cnds_ac_id }}" application_credential_secret: "{{ clouds_conf.cnds_ac_secret }}" #project_id: 225a7363dab74b69aa1e3f744aced109 + cc-rrze: + region_name: "DE-ERL" + interface: "public" + identity_api_version: 3 + auth_type: "v3applicationcredential" + auth: + auth_url: https://api.cc.rrze.de:5000 + application_credential_id: "{{ clouds_conf.cc_rrze_ac_id }}" + application_credential_secret: "{{ clouds_conf.cc_rrze_a_ac_secret }}" pco-prod1: region_name: "prod1" interface: "public" @@ -119,12 +128,3 @@ clouds: application_credential_id: "{{ clouds_conf.wavestack_ac_id }}" application_credential_secret: "{{ clouds_conf.wavestack_ac_secret }}" auth_type: "v3applicationcredential" - cc-rrze: - region_name: "DE-ERL" - interface: "public" - identity_api_version: 3 - auth_type: "v3applicationcredential" - auth: - auth_url: https://api.cc.rrze.de:5000 - application_credential_id: "{{ clouds_conf.cc-rrze_ac_id }}" - application_credential_secret: "{{ clouds_conf.cc-rrze_a_ac_secret }}" From adc5db35dfe76ba4e96bc88f6ae669d8978ba62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=BCchse?= Date: Tue, 10 Dec 2024 09:05:00 +0100 Subject: [PATCH 6/6] Bugfix: added missing quotation mark MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matthias Büchse --- compliance-monitor/bootstrap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compliance-monitor/bootstrap.yaml b/compliance-monitor/bootstrap.yaml index 935cc8ca7..94db6000e 100644 --- a/compliance-monitor/bootstrap.yaml +++ b/compliance-monitor/bootstrap.yaml @@ -33,7 +33,7 @@ accounts: keys: - public_key: "AAAAC3NzaC1lZDI1NTE5AAAAIF8kQx6ur/WSSY9ThK/mwhrl/VsYnjRk44GSXBy3VfKI" public_key_type: "ssh-ed25519" - public_key_name: "primary + public_key_name: "primary" - subject: pco-prod1 delegates: - zuul_ci