Skip to content

Commit 4b77ce4

Browse files
garloffgarloff
authored
Merge branch 'main' into dependabot/pip/compliance-monitor/pip-445d0b7773
2 parents 397c3d5 + 3fb006a commit 4b77ce4

File tree

7 files changed

+167
-0
lines changed

7 files changed

+167
-0
lines changed

‎.zuul.d/secure.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,28 @@
5757
Vjo5fBpIjEOLNtA40vx0Agx1Red2eMFA5oLcxiDMBSP4nLiI1QNROSnGc7GYoIT5kyq8k
5858
P5Uw261H4un2xvpO9ZBuHEV5mskTiBazTPDwaqU3yZoyGIvdQl2Uo6S3Glnf41YH+k/hN
5959
jxzziQB9sT2glnmmzrzZ22xPZg+sTngWS/3svRYV9BXKnMgq8jjR6eIKGYSwyQ=
60+
cc_rrze_ac_id: !encrypted/pkcs1-oaep
61+
- DUgJ7ozJOzJq1TSmBE6P8RGAW6C+s9LDRbW6mHIbAQlAX3+21d/KgoLk9zEyDdOanK1yd
62+
QaEZJDjURsIAcHJh7vh9w/2Z948XKDybxIOb1tcJGJU1LsEmYoNAQXM5G3+l8Z66Crpgw
63+
RE+wBlSe1dhXrhiGefH2ykvbRtPggJMFECpy+rVg16GhGSlnzptVk4F2GEGpzkEx84B0J
64+
0h/HdX/y40xoeBx6giVZrZsOGnvWmMLqIq5Q5NMa1hdY0yGbpAUruqFrkVYZGU59ygEuo
65+
60mJD0R1wQOo14wZtXob67V0DO9AcdRJHZRDRKyclPyGkf/QbCBf8+DCqAd/BKbe9a818
66+
Z7M8aeylvO/digVAqJa5zin3vOz5PJUGkv0GZjjcgGkwV+d/7pWwebBsXNjBKj9HgX3Xe
67+
eU6ZmfIJHb3pB4X+RySTIFAjp60Tb6QLe7yE1aJ5Ffc8ZsGqLhYcH0Q+SWhh3A6EJirRY
68+
T76Ufw5n04L7GT+nP1Cy6Lf2eSPvJCto9y5iSfnayyssWmkDmcgrYVJXhktuR6Gy6sTQu
69+
0+s9ynznFVG0PVexLZVo7fCmcFydGHeoupCj0kHIc46hCMogEQI7CI+462jS5Rznhs+2J
70+
cK5NYc1gl6woxeJq3fwITw0eGK+zqrUMsBAV1FKrgfkYuFydRA/JRQSd3+vEOI=
71+
cc_rrze_ac_secret: !encrypted/pkcs1-oaep
72+
- pW3PjqBbzTNc3PfESczT4DXlk1mfiC6PMqkLidggcVRawlEy/UT7Dmynjr+lvkJz6oHIo
73+
vnfnviKW7t6VqUgv5h4rRbh3PaCJqrCL35X7hW1uJSvyOgq3he836+78W23j/JhyO/gKk
74+
9okn31np0uWguiIueCXjIgfkq2M/rJ3Aq//6siT/BKGmUupu6J7lskd47IHsOFV6oVT/t
75+
MT+QrOJEP1KDlIiwbQsoiX9r+39/RR2qvhxMCW5Bh068TJI206oKPmJcR5doDBgygOhhj
76+
HFwmox9X6F4jR1uDLAjxzdX7pC/JHaYGEe4rBYJ+RB4HKAH+4p7Fvy152quDkUsQPmJjn
77+
ivRk6eR9/NrMPpljsvdIs9J/dPsdbCmM55rnGvo+BBh2lA7LrNzgcAHQ8se1UozaTzzlC
78+
AIiZRchy6ivAucQEJv7iKXRgR2YLq4yO3GYOmY0bcGkE+K2Envuq1mz1Dt874Rc4FyGSN
79+
diK3gdP7uWp0nVp4BXCXIygscdQe/rMCgrVSFV3l6EEz+nuaZM0AodkPccjuPdFnxainq
80+
JQEGmPnox+w8UgMNpR3BSIY3qZpEsIrOejX/L0tM4+z1mozdSnhajJV4dkj8xYreJKQJC
81+
lwpQQDNBIyjwvq6GJjreu0ZEWdwBAYmodhaH8odgd/cpctXB/tuzqgpnEwQt2E=
6082
cnds_ac_id: !encrypted/pkcs1-oaep
6183
- apArEei+9Eu0NrelesebDZwUjGvbep58dAQowtcCEn1hzbUAqMxWm74Ibk1e+C3prH5Zv
6284
tcj+okUoyfelP8ExqCZL55cOZVentoyg/VfiwZlR1z9N/p3vDkN3sx8z6o7CJux2oFMkg

‎Community-Governance/2024-12-project-board-nominees.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Nominees 2024-12 Project Board
2+
3+
For the term 2024-12 - 2025-12 the following people are nominated / have nominated themselves:
4+
5+
| Name | Github Handle | E-Mail |
6+
| ------------------| ------------- | -------------------- |
7+
| Christian Berendt | @berendt | <berendt@osism.tech> |
8+
| Kurt Garloff | @garloff | <scs@garloff.de> |

‎Standards/scs-0005-v1-project-governance.md‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
---
2+
title: Sovereign Cloud Standards
3+
type: Procedural
4+
status: Draft
5+
track: Global
6+
description: |
7+
SCS-0005 outlines the structure and governance of the SCS community by the SCS Project Board and how this is elected.
8+
---
9+
10+
## Introduction
11+
12+
The [Sovereign Cloud Stack (SCS)](https://scs.community) provides standards
13+
for a range of cloud infrastructure types as well as a modular open-source
14+
reference implementation.
15+
The project is governed by the _SCS Project Board_.
16+
17+
## Role of the _SCS Project Board_
18+
19+
The role of the _SCS Project Board_ is the overall governance of the SCS Community and Project.
20+
This happens together with the _Forum SCS-Standards_ of the Open Source Business Alliance. To further
21+
underline this alignment, the _Forum SCS-Standards_ is part of the _SCS Project Board_.
22+
The _SCS Project Board_ itself is elected by the _SCS Community_.
23+
24+
### Definitions
25+
26+
#### _SCS Project_
27+
28+
The _SCS Project_ is the Open-Source project that consists of the software, documentation, documents, blog posts as well as the people ("_SCS Community_") working on this.
29+
30+
#### _SCS Community_
31+
32+
The collective of people, companies, and organizations promoting the idea of the _SCS Project_ as well as the people working on the various aspects.
33+
34+
#### _SCS GitHub Organization_
35+
36+
The _SCS GitHub Organization_ is this: [https://github.com/sovereigncloudstack](https://github.com/sovereigncloudstack)
37+
38+
### Roles in the _SCS GitHub Organization_
39+
40+
#### Members
41+
42+
Joining the SCS GitHub Organization as a contributor results in being assigned the **member role** in the organization. Members are contributors or collaborators who:
43+
44+
- Actively contribute to projects within the organization.
45+
- Have repository-specific access based on their contributions.
46+
- Are eligible to vote in elections and nominate candidates for the _SCS Project Board_.
47+
- Must adhere to the [Code of Conduct](https://github.com/SovereignCloudStack/.github/blob/main/CODE_OF_CONDUCT.md).
48+
49+
#### Owners
50+
51+
Members of the _SCS Project Board_ are also designated as **owners** of the SCS GitHub organization. Owners have administrative privileges, including:
52+
53+
- Managing organization-level settings.
54+
- Onboarding new members.
55+
- Enforcing compliance with governance and community standards.
56+
57+
This alignment ensures that governance roles in the SCS Project Board directly translate into operational responsibilities within the GitHub organization.
58+
59+
## Joining the SCS GitHub Organization
60+
61+
Since being part of the GitHub organization comes with a set of responsibilities, joining the SCS GitHub Organization can be done by:
62+
63+
- being invited by the _SCS Project Board_
64+
- submitting a request to be onboarded as a member to the _SCS Project Board_
65+
- have existing members of the GitHub organization nominate you
66+
67+
One of these items is sufficient.
68+
69+
Actively contributing to one or several of the projects under the governance of the SCS project board should typically result in a membership. Please be aware of our [Code of Conduct](https://github.com/SovereignCloudStack/.github/blob/main/CODE_OF_CONDUCT.md).
70+
71+
## Election of the _SCS Project Board_
72+
73+
### Term
74+
75+
The _SCS Project Board_ is elected for the term of one year. Elections are done
76+
within the last six weeks of the calendar year.
77+
78+
### Seats on the board
79+
80+
The _SCS Project Board_ contains five seats. One of these seats is filled by
81+
the delegate of the _Forum SCS-Standards_. The other four seats are voted upon.
82+
83+
### Nominations
84+
85+
Every person who is part of the Sovereign Cloud Stack GitHub organization can be
86+
nominated for the board. Likewise, one can nominate oneself.
87+
The nomination is done by adding the person with the required data to the file corresponding to the term in the "Community-Governance" folder in the [Standards](https://github.com/sovereignCloudStack/standards/) repository. Obviously, the person, that is to be nominated, should be asked before being added to the file.
88+
89+
### Eligible for voting
90+
91+
Every person who is a member of the GitHub organization "Sovereign Cloud Stack" is eligible for voting. In order to be able to vote an onboarding onto the Identity Management of the SCS community needs to happen.
92+
93+
### Electoral management
94+
95+
The voting process is governed by the _Forum SCS-Standards_.
96+
Voting is done using the [Condorcet Internet Voting Service](https://civs.cs.cornell.edu). This is the same system as is [being used by the OpenInfra foundation](https://wiki.openstack.org/wiki/Election_Officiating_Guidelines#Running_the_election_itself).
97+
98+
### Voting period
99+
100+
The voting will be open for a week.
101+
102+
### Announcement
103+
104+
The voting will be announced on the SCS-Members Mailinglist as well as on the [General & Announcements](https://matrix.to/#/#scs-general:matrix.org). Enlisted voters will receive e-mails to the email address used in the SCS community's Identity Management system.
105+
106+
### Mechanisms
107+
108+
Each eligible voter is asked to rank the candidates according to their priorities.
109+
The four favorite choices among all voters will be elected into the _SCS Project Board_.
110+
111+
## Roles in the _SCS Project Board_
112+
113+
Among the elected Project Board a spokesperson is nominated. The spokesperson is
114+
elected by a simple majority vote among the members of the project board. The
115+
spokesperson is elected for the whole term.

‎Tests/config.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ scopes = [
1919
subjects = [
2020
"gx-scs",
2121
"artcodix",
22+
"cc-rrze",
2223
"pco-prod1",
2324
"pco-prod2",
2425
"pco-prod3",

‎compliance-monitor/bootstrap.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ accounts:
2525
- subject: artcodix
2626
delegates:
2727
- zuul_ci
28+
- subject: cc-rrze
29+
delegates:
30+
- zuul_ci
31+
api_keys:
32+
- "$argon2id$v=19$m=65536,t=3,p=4$iLG29t7be88ZY6w1Rui91w$9UwkTMLBMxq/1QyeVfJcc95fhQtY1AC48Rex4S8ZSIU"
33+
keys:
34+
- public_key: "AAAAC3NzaC1lZDI1NTE5AAAAIF8kQx6ur/WSSY9ThK/mwhrl/VsYnjRk44GSXBy3VfKI"
35+
public_key_type: "ssh-ed25519"
36+
public_key_name: "primary"
2837
- subject: pco-prod1
2938
delegates:
3039
- zuul_ci

‎compliance-monitor/templates/overview.md.j2‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ Version numbers are suffixed by a symbol depending on state: * for _draft_, †
1414
| [aov.cloud](https://www.aov.de/) | Community cloud for customers | aov IT.Services GmbH |
1515
{#- #} [{{ results | pick('aov', iaas) | summary }}]({{ detail_url('aov', iaas) }}) {# -#}
1616
| [HM](https://health.aov.cloud/) |
17+
| [CC@RRZE](https://www.rrze.fau.de/) | Private Compute Cloud (CC) for [FAU](https://www.fau.de/) | Regionales Rechenzentrum Erlangen |
18+
{#- #} [{{ results | pick('cc-rrze', iaas) | summary }}]({{ detail_url('cc-rrze', iaas) }}) {# -#}
19+
| (soon) |
1720
| [CNDS](https://cnds.io/) | Public cloud for customers | artcodix GmbH |
1821
{#- #} [{{ results | pick('artcodix', iaas) | summary }}]({{ detail_url('artcodix', iaas) }}) {# -#}
1922
| [HM](https://ohm.muc.cloud.cnds.io/) |

‎playbooks/clouds.yaml.j2‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ clouds:
1919
application_credential_id: "{{ clouds_conf.cnds_ac_id }}"
2020
application_credential_secret: "{{ clouds_conf.cnds_ac_secret }}"
2121
#project_id: 225a7363dab74b69aa1e3f744aced109
22+
cc-rrze:
23+
region_name: "DE-ERL"
24+
interface: "public"
25+
identity_api_version: 3
26+
auth_type: "v3applicationcredential"
27+
auth:
28+
auth_url: https://api.cc.rrze.de:5000
29+
application_credential_id: "{{ clouds_conf.cc_rrze_ac_id }}"
30+
application_credential_secret: "{{ clouds_conf.cc_rrze_ac_secret }}"
2231
pco-prod1:
2332
region_name: "prod1"
2433
interface: "public"

0 commit comments

Comments
 (0)