Skip to content

Commit c676f5f

Browse files
authored
Merge branch 'main' into 526-refine-cve-check-in-scs-0210-v2-test-script
2 parents cea9840 + 0cccea1 commit c676f5f

33 files changed

+1367
-578
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

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
**/__pycache__/
22
.venv/
33
.idea
4+
.sandbox
45
.DS_Store
56
node_modules
67
Tests/kaas/results/

.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

Standards/scs-0102-v1-image-metadata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: SCS Image Metadata Standard
2+
title: SCS Image Metadata
33
type: Standard
44
stabilized_at: 2022-10-31
55
status: Stable

Standards/scs-0114-v1-volume-type-standard.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
2-
title: Volume Type Standard
2+
title: SCS Volume Types
33
type: Standard
4-
status: Draft
5-
track: IaaS
4+
status: Stable
5+
stabilized_at: 2024-11-13
6+
track: IaaS
67
---
78

89
## Introduction

Standards/scs-0115-v1-default-rules-for-security-groups.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
title: Default Rules for Security Groups
33
type: Standard
4-
status: Draft
4+
status: Stable
5+
stabilized_at: 2024-11-13
56
track: IaaS
67
---
78

@@ -25,7 +26,7 @@ Administrator (abbr. Admin)
2526

2627
### Default Security Groups, Custom Security Groups and default Security Group Rules
2728

28-
To properly understand the concepts in this standard and avoid ambiguity, is very important to distinguish between the following similar-sounding but different resources in the OpenStack Networking API:
29+
To properly understand the concepts in this standard and avoid ambiguity, it is very important to distinguish between the following similar-sounding but different resources in the OpenStack Networking API:
2930

3031
1. default Security Group
3132
2. custom Security Group
@@ -59,10 +60,10 @@ Therefore, this standard proposes default Security Group rules that MUST be set
5960

6061
## Design Considerations
6162

62-
Up to the 2023.1 release (antelope) the default Security Group rules are hardcoded in the OpenStack code.
63-
We should not require to change this behavior through code changes in deployments.
63+
Up to the 2023.1 release (Antelope) the default Security Group rules are defined in the OpenStack code.
64+
We should not require changing this behavior through code changes in deployments.
6465

65-
Beginning with the 2023.2 release (bobcat) the default Security Group rules can now be edited by administrators through an API.
66+
Beginning with the 2023.2 release (Bobcat) the default Security Group rules can now be edited by administrators through an API.
6667
All rules that should be present as default in Security Groups have to be configured by admins through this API.
6768

6869
There are two ways to approach a standard for the default rules of Security Groups.

Standards/scs-0116-v1-key-manager-standard.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
2-
title: Key Manager Standard
2+
title: SCS Key Manager Standard
33
type: Standard
4-
status: Draft
4+
status: Stable
5+
stabilized_at: 2024-11-13
56
track: IaaS
67
---
78

Standards/scs-0116-w1-key-manager-implementation-testing.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ This can be done with a small change in the policy.yaml file. The `creator` has
4444
The check for the presence of a Key Manager is done with a test script, that checks the presence of a Key Manager service in the catalog endpoint of Openstack.
4545
This check can eventually be moved to the checks for the mandatory an supported service/API list, in case of a promotion of the Key Manager to the mandatory list.
4646
47+
### Implementation
48+
49+
The script [`check-for-key-manager.py`](https://github.com/SovereignCloudStack/standards/blob/main/Tests/iaas/key-manager/check-for-key-manager.py)
50+
connects to OpenStack and performs the checks described in this section.
51+
4752
## Manual Tests
4853

4954
It is not possible to check a deployment for a correctly protected Master KEK automatically from the outside.

Standards/scs-0117-v1-volume-backup-service.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
title: Volume Backup Functionality
33
type: Standard
4-
status: Draft
4+
status: Stable
5+
stabilized_at: 2024-11-13
56
track: IaaS
67
---
78

0 commit comments

Comments
 (0)