Skip to content

Commit abb888e

Browse files
fzakfeldmbuechse
andauthored
Add ScaleUp Open Cloud Region OCC2 (#797)
* Add ScaleUp OCC2 Cloud Signed-off-by: Freerk-Ole Zakfeld <[email protected]> * add scaleup_occ2_ac_... to secure.yaml Signed-off-by: Matthias Büchse <[email protected]> --------- Signed-off-by: Freerk-Ole Zakfeld <[email protected]> Signed-off-by: Matthias Büchse <[email protected]> Co-authored-by: Matthias Büchse <[email protected]>
1 parent a6eab84 commit abb888e

File tree

7 files changed

+69
-0
lines changed

7 files changed

+69
-0
lines changed

.github/scs-compliance-check/openstack/clouds.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@ clouds:
8989
auth:
9090
auth_url: https://identity.l1a.cloudandheat.com/v3
9191
application_credential_id: "7ab4e3339ea04255bc131868974cfe63"
92+
scaleup-occ2:
93+
auth_type: v3applicationcredential
94+
auth:
95+
auth_url: https://keystone.occ2.scaleup.cloud
96+
application_credential_id: "5d2eea4e8bf8448092490b4190d4430a"
97+
region_name: "RegionOne"
98+
interface: "public"
99+
identity_api_version: 3
92100
syseleven-dus2:
93101
interface: public
94102
identity_api_verion: 3
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "Compliance IaaS v4 of scaleup-occ2"
2+
3+
on:
4+
# Trigger compliance check every day at 4:30 UTC
5+
schedule:
6+
- cron: '30 4 * * *'
7+
# Trigger compliance check after Docker image has been built
8+
workflow_run:
9+
workflows: [Build and publish scs-compliance-check Docker image]
10+
types:
11+
- completed
12+
# Allows you to run this workflow manually from the Actions tab
13+
workflow_dispatch:
14+
15+
jobs:
16+
check-scaleup-occ2:
17+
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
18+
with:
19+
version: v4
20+
layer: iaas
21+
cloud: scaleup-occ2
22+
secret_name: OS_PASSWORD_SCALEUP_OCC2
23+
secrets: inherit

.zuul.d/secure.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,28 @@
233233
VCsXjf0qBBMrzz6HP9z95Bk44fiJ3L/LkA3Iij961dYrQXbZKDrKOiX/QPwrcSrVmjmew
234234
UbPexJFHgvTCqjadoLejSt9cUd9lVzhuzLJ8CS+CcCMbZOno6qathrd2B88riQaPNIGNu
235235
gfkNT9R63ZzKB1qIA2n5RZi7SH9DPIUd0AwLMn2bhp3uok5pNAPP/4/1RkQiCA=
236+
scaleup_occ2_ac_id: !encrypted/pkcs1-oaep
237+
- N2duwkcMdOXw6wF0deE/0BPM1M/URt3eWmrnBJ89VHeCDENGfTfDHcWPYs3wW4rSRCG6t
238+
gqgNuA049OvOhL7rtjNHZ6yIj6xEHH/YdqT4UxjXPS9GFwoJXDtE8rIGjK3KU8GfUgKnG
239+
DLplyyzGzx5j39rJAS628InmC56aip47rO1J4HQE9Ku25Wb06R7ykx+0ZOWr0HXjV/VsV
240+
uwfyL+DPgewbL+4u8/XkcI0FwAM9/KkF/CcYUq5aVMdQS2foatTQW0C2idg+pffSTRaau
241+
VF44rkVfzsCOz4MYAFpLIaL9Zxx1FifaPOd0oi6rEFjGd6vFtFCHk1BRpKmOITLyx3Te5
242+
zVffSkQAsqpn/4er8800bjQzxXvqmQmR0QwPM7dhvRnrNbTSCA/Awm5BPaUgeCZFN3MPN
243+
Mc0XIaEwjuJvDK6fqj5tJrVIs5bxAmqRDj8d76AlJcOdDxHicTHgR3aUG4AKOWkUsskgQ
244+
3xR8lPh31O/HgzG9tq6o/DCPA1O9wyyOyT7KwJAaRASPCA1O80ZAzhZUNUVyut6dYEwaS
245+
QXP4IaEJOxP8EkxR7FDEuO99UFZ7TXQ1CF7ots4wIs5tEpQvcdLnvBjJckp0fNBFTuGMm
246+
FCvhgBK30NC93U4DxQv6xZBhqtvHYjHcTOXvz2fryRJT2teMN+eI+RDdV1Jj8Y=
247+
scaleup_occ2_ac_secret: !encrypted/pkcs1-oaep
248+
- LfUHhslK41JDp3CpslWGGA4bZ3udZh4KnytcXohkdbchb8QVt8eNc4nD0ti0/XS18YKwq
249+
DlHOWw2rDJZ8RGIXENVUYzDbECoBErE8IAqQE0q3oS/8Oq0NYOFTGvvlKuue7U4s87Pwi
250+
YFi+Q0Rv7vO8cWFVtbRHK+Hw6pC42Biq2T+tuVBCLqylIMViXpuEy9UpFLEv59zr6EHa9
251+
uB3xkjnpWuabe7vrG+LQHc0pJ5tNhcLiOnJggU5Ef02FBy+t6xvuJW8f6cXCnRRj1q0fl
252+
D/vTmC7avwHnWC+J4WLL69HCwW05I7iHftVSWOXQgRzMBd4D4ND2OXfsWElu0eOV5XG6X
253+
JsQH8lDnVN/lqaDAOYR4fk4+9yt3RURwvNL5FUnDK1t7LAI4X0gcvLrQAfzgOlpBYDXSK
254+
0kbUzqwivuw1v2zO/gxQU+J28PsOfZaKf/7ZZyj3e/tiq4wBpvPb0mVBwWXigKqzr+QED
255+
Iy2u/g3x2qdcTpXR/RPq+xiXM2B2rw1V5gdkscdL+avXtTF7hT9HrcayHx3HDZ/h6aGPD
256+
RWIJ8bstl+x2Q4zExgR13amWM8ZR1iLGCN20U/ZAaqANCqjDbrSVSTjTPzYtNFwAXwxkB
257+
3NHhPDHZ1MIdr6IJE4IZ4TCMsIeTA2UHNfF4RCzeDSIJ+CXOQxUFWOxZkf97WY=
236258
syseleven_dus2_ac_id: !encrypted/pkcs1-oaep
237259
- SjwtIvJO7DkLJDmS+T/Z5utFBa22hmPRBd8mzonJHGgURB2W7fmXFreD9NPrLfbt7ujKi
238260
KNqJm8k1Vr1F3Mu+Osr0BWSnq5makwVt2ikBY4qPbL8iyVXsByaT/HNPLCOokqy+REpfu

Tests/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ subjects = [
2626
"poc-kdo",
2727
"poc-wgcloud",
2828
"regio-a",
29+
"scaleup-occ2",
2930
"syseleven-dus2",
3031
"syseleven-ham1",
3132
"wavestack",

compliance-monitor/bootstrap.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ accounts:
5050
- public_key: "AAAAC3NzaC1lZDI1NTE5AAAAILufk4C7e0eQQIkmUDK8GB2IoiDjYtv6mx2eE8wZ3VWT"
5151
public_key_type: "ssh-ed25519"
5252
public_key_name: "primary"
53+
- subject: scaleup-occ2
54+
delegates:
55+
- zuul_ci
5356
- subject: syseleven-dus2
5457
delegates:
5558
- zuul_ci

compliance-monitor/templates/overview.md.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ for the time being to have the highest degree of control
3232
| [REGIO.cloud](https://regio.digital) | Public cloud for customers | OSISM GmbH |
3333
{#- #} [{{ results | pick('regio-a', iaas) | summary }}]({{ detail_url('regio-a', iaas) }}) {# -#}
3434
| [HM](https://apimon.services.regio.digital/public-dashboards/17cf094a47404398a5b8e35a4a3968d4?orgId=1&refresh=5m) |
35+
| [ScaleUp Open Cloud](https://www.scaleuptech.com/cloud-hosting/) | Public cloud for customers | ScaleUp Technologies GmbH & Co. KG |
36+
{#- #} [{{ results | pick('scaleup-occ2', iaas) | summary }}]({{ detail_url('scaleup-occ2', iaas) }}) {# -#}
37+
| [HM](https://health.occ2.scaleup.sovereignit.cloud) |
3538
| [syseleven](https://www.syseleven.de/en/products-services/openstack-cloud/)<br />(2 SCS regions) | Public OpenStack Cloud | SysEleven GmbH | {# #}
3639
{#- #}dus2: [{{ results | pick('syseleven-dus2', iaas) | summary }}]({{ detail_url('syseleven-dus2', iaas) }}){# -#}
3740
<br />

playbooks/clouds.yaml.j2

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@ clouds:
8383
application_credential_id: "{{ clouds_conf.regio_a_ac_id }}"
8484
application_credential_secret: "{{ clouds_conf.regio_a_ac_secret }}"
8585
auth_type: "v3applicationcredential"
86+
scaleup-occ2:
87+
auth_type: v3applicationcredential
88+
auth:
89+
auth_url: https://keystone.occ2.scaleup.cloud
90+
application_credential_id: "{{ clouds_conf.scaleup_occ2_ac_id }}"
91+
application_credential_secret: "{{ clouds_conf.scaleup_occ2_ac_secret }}"
92+
region_name: "RegionOne"
93+
interface: "public"
94+
identity_api_version: 3
8695
syseleven-dus2:
8796
interface: public
8897
identity_api_verion: 3

0 commit comments

Comments
 (0)