Skip to content

Commit b8eb065

Browse files
priteauAlex-Welsh
authored andcommitted
Add Rocky Linux security repositories
1 parent 43907ef commit b8eb065

8 files changed

Lines changed: 66 additions & 0 deletions

File tree

etc/kayobe/dnf.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,15 @@ dnf_custom_repos_rocky_9:
193193
gpgcheck: yes
194194
username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
195195
password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
196+
security:
197+
baseurl: "{{ stackhpc_repo_rocky_9_security_url }}"
198+
description: "Rocky Linux $releasever - Security"
199+
enabled: "{{ dnf_enable_rocky_security | bool }}"
200+
file: rocky-security
201+
gpgkey: "{{ rocky_9_gpg_key }}"
202+
gpgcheck: yes
203+
username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
204+
password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
196205
security-common:
197206
baseurl: "{{ stackhpc_repo_rocky_9_sig_security_common_url }}"
198207
description: "Rocky Linux $releasever - SIG Security Common"
@@ -276,6 +285,9 @@ dnf_enable_docker: true
276285
# systems only.
277286
dnf_install_doca: "{{ 'mlnx' in group_names }}"
278287

288+
# Whether to enable the Rocky Linux security repository.
289+
dnf_enable_rocky_security: false
290+
279291
###############################################################################
280292
# DNF Automatic configuration.
281293

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_vers
5858
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
5959
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
6060
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
61+
stackhpc_repo_rocky_9_security_version: "{{ stackhpc_pulp_repo_rocky_9_security_version }}"
6162
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_multiarch_rocky_9_sig_security_common_version }}"
6263
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
6364
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_vers
9090
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
9191
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
9292
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
93+
stackhpc_repo_rocky_9_security_version: "{{ stackhpc_pulp_repo_rocky_9_security_version }}"
9394
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_multiarch_rocky_9_sig_security_common_version }}"
9495
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
9596
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstrea
5050
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
5151
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
5252
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
53+
stackhpc_repo_rocky_9_security_version: "{{ stackhpc_pulp_repo_rocky_9_security_version }}"
5354
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_multiarch_rocky_9_sig_security_common_version }}"
5455

5556
# Rocky-and-CI-specific Pulp urls

etc/kayobe/pulp-repo-versions.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ stackhpc_pulp_repo_rocky_10_1_extras_version: 20260226T235218
7373
stackhpc_pulp_repo_rocky_10_1_highavailability_aarch64_version: 20260506T232721
7474
stackhpc_pulp_repo_rocky_10_1_highavailability_source_version: 20260428T223954
7575
stackhpc_pulp_repo_rocky_10_1_highavailability_version: 20260506T223941
76+
stackhpc_pulp_repo_rocky_10_1_security_aarch64_version: 20260510T225242
77+
stackhpc_pulp_repo_rocky_10_1_security_source_version: 20260510T222658
78+
stackhpc_pulp_repo_rocky_10_1_security_version: 20260510T223302
7679
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
7780
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
7881
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328
@@ -128,6 +131,9 @@ stackhpc_pulp_repo_rocky_9_7_extras_version: 20260226T231043
128131
stackhpc_pulp_repo_rocky_9_7_highavailability_aarch64_version: 20260506T224443
129132
stackhpc_pulp_repo_rocky_9_7_highavailability_source_version: 20260429T221435
130133
stackhpc_pulp_repo_rocky_9_7_highavailability_version: 20260506T215314
134+
stackhpc_pulp_repo_rocky_9_7_security_aarch64_version: 20260510T220648
135+
stackhpc_pulp_repo_rocky_9_7_security_source_version: 20260510T215711
136+
stackhpc_pulp_repo_rocky_9_7_security_version: 20260510T213653
131137
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20260305T225932
132138
stackhpc_pulp_repo_rocky_9_sig_security_common_source_version: 20260305T224636
133139
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20260305T222525

etc/kayobe/pulp.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,18 +217,21 @@ stackhpc_pulp_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_app
217217
stackhpc_pulp_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_9_extras_x86_64_version }}"
218218
stackhpc_pulp_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_9_crb_x86_64_version }}"
219219
stackhpc_pulp_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_9_highavailability_x86_64_version }}"
220+
stackhpc_pulp_repo_rocky_9_security_version: "{{ stackhpc_pulp_repo_rocky_9_security_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_9_security_x86_64_version }}"
220221

221222
# Rocky 9 architecture-specific snapshot versions.
222223
stackhpc_pulp_repo_rocky_9_baseos_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_baseos_version') }}"
223224
stackhpc_pulp_repo_rocky_9_appstream_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_appstream_version') }}"
224225
stackhpc_pulp_repo_rocky_9_extras_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_extras_version') }}"
225226
stackhpc_pulp_repo_rocky_9_crb_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_crb_version') }}"
226227
stackhpc_pulp_repo_rocky_9_highavailability_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_highavailability_version') }}"
228+
stackhpc_pulp_repo_rocky_9_security_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_security_version') }}"
227229
stackhpc_pulp_repo_rocky_9_baseos_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_baseos_aarch64_version') }}"
228230
stackhpc_pulp_repo_rocky_9_appstream_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_appstream_aarch64_version') }}"
229231
stackhpc_pulp_repo_rocky_9_extras_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_extras_aarch64_version') }}"
230232
stackhpc_pulp_repo_rocky_9_crb_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_crb_aarch64_version') }}"
231233
stackhpc_pulp_repo_rocky_9_highavailability_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_highavailability_aarch64_version') }}"
234+
stackhpc_pulp_repo_rocky_9_security_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_security_aarch64_version') }}"
232235

233236
# Rocky 9 Multiarch repositories
234237
#NOTE(bbezak): Versioned Erlang repos (aarch64 only). Fallback to generic Erlang version if not defined.
@@ -270,18 +273,21 @@ stackhpc_pulp_repo_rocky_10_baseos_version: "{{ stackhpc_pulp_repo_rocky_10_base
270273
stackhpc_pulp_repo_rocky_10_extras_version: "{{ stackhpc_pulp_repo_rocky_10_extras_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_10_extras_x86_64_version }}"
271274
stackhpc_pulp_repo_rocky_10_crb_version: "{{ stackhpc_pulp_repo_rocky_10_crb_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_10_crb_x86_64_version }}"
272275
stackhpc_pulp_repo_rocky_10_highavailability_version: "{{ stackhpc_pulp_repo_rocky_10_highavailability_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_10_highavailability_x86_64_version }}"
276+
stackhpc_pulp_repo_rocky_10_security_version: "{{ stackhpc_pulp_repo_rocky_10_security_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_10_security_x86_64_version }}"
273277

274278
# Rocky 10 architecture-specific snapshot versions.
275279
stackhpc_pulp_repo_rocky_10_appstream_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_appstream_version') }}"
276280
stackhpc_pulp_repo_rocky_10_baseos_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_baseos_version') }}"
277281
stackhpc_pulp_repo_rocky_10_extras_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_extras_version') }}"
278282
stackhpc_pulp_repo_rocky_10_crb_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_crb_version') }}"
279283
stackhpc_pulp_repo_rocky_10_highavailability_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_highavailability_version') }}"
284+
stackhpc_pulp_repo_rocky_10_security_x86_64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_security_version') }}"
280285
stackhpc_pulp_repo_rocky_10_appstream_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_appstream_aarch64_version') }}"
281286
stackhpc_pulp_repo_rocky_10_baseos_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_baseos_aarch64_version') }}"
282287
stackhpc_pulp_repo_rocky_10_extras_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_extras_aarch64_version') }}"
283288
stackhpc_pulp_repo_rocky_10_crb_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_crb_aarch64_version') }}"
284289
stackhpc_pulp_repo_rocky_10_highavailability_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_highavailability_aarch64_version') }}"
290+
stackhpc_pulp_repo_rocky_10_security_aarch64_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_10_' ~ stackhpc_pulp_repo_rocky_10_minor_version ~ '_security_aarch64_version') }}"
285291

286292
# Rocky 10 Multiarch repositories
287293
stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch' ~ arch_suffix ~ '_version') }}"
@@ -436,6 +442,18 @@ stackhpc_pulp_rpm_repos:
436442
base_path: "rocky/9/highavailability/aarch64/os/"
437443
required: "{{ stackhpc_pulp_sync_rocky_9 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}"
438444

445+
- name: Rocky Linux 9 - Security
446+
url: "{{ stackhpc_release_pulp_content_url }}/rocky/9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/security/x86_64/os/{{ stackhpc_pulp_repo_rocky_9_security_x86_64_version }}"
447+
distribution_name: "rocky-9-security-"
448+
base_path: "rocky/9/security/x86_64/os/"
449+
required: "{{ stackhpc_pulp_sync_rocky_9 | bool and 'x86_64' in stackhpc_pulp_rpm_architectures }}"
450+
451+
- name: Rocky Linux 9 - Security - aarch64
452+
url: "{{ stackhpc_release_pulp_content_url }}/rocky/9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/security/aarch64/os/{{ stackhpc_pulp_repo_rocky_9_security_aarch64_version }}"
453+
distribution_name: "rocky-9-security-aarch64-"
454+
base_path: "rocky/9/security/aarch64/os/"
455+
required: "{{ stackhpc_pulp_sync_rocky_9 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}"
456+
439457
- name: Rocky Linux 9 - SIG Security Common
440458
url: "{{ stackhpc_release_pulp_content_url }}/rocky/sig/9/security/x86_64/security-common/{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"
441459
distribution_name: rocky-9-sig-security-common-
@@ -638,6 +656,18 @@ stackhpc_pulp_rpm_repos:
638656
base_path: "rocky/10/highavailability/aarch64/os/"
639657
required: "{{ stackhpc_pulp_sync_rocky_10 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}"
640658

659+
- name: Rocky Linux 10 - Security
660+
url: "{{ stackhpc_release_pulp_content_url }}/rocky/10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}/security/x86_64/os/{{ stackhpc_pulp_repo_rocky_10_security_x86_64_version }}"
661+
distribution_name: "rocky-10-security-"
662+
base_path: "rocky/10/security/x86_64/os/"
663+
required: "{{ stackhpc_pulp_sync_rocky_10 | bool and 'x86_64' in stackhpc_pulp_rpm_architectures }}"
664+
665+
- name: Rocky Linux 10 - Security - aarch64
666+
url: "{{ stackhpc_release_pulp_content_url }}/rocky/10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}/security/aarch64/os/{{ stackhpc_pulp_repo_rocky_10_security_aarch64_version }}"
667+
distribution_name: "rocky-10-security-aarch64-"
668+
base_path: "rocky/10/security/aarch64/os/"
669+
required: "{{ stackhpc_pulp_sync_rocky_10 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}"
670+
641671
# Additional CentOS Stream 10 repositories
642672
- name: CentOS Stream 10 - NFV OpenvSwitch
643673
url: "{{ stackhpc_release_pulp_content_url }}/centos/10-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_version }}"

etc/kayobe/stackhpc.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_repo_distribution }}"
141141
stackhpc_repo_rocky_9_highavailability_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/highavailability/$basearch/os/{{ stackhpc_repo_rocky_9_highavailability_version }}"
142142
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_repo_distribution }}"
143143

144+
# Rocky 9 Security
145+
stackhpc_repo_rocky_9_security_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/security/$basearch/os/{{ stackhpc_repo_rocky_9_security_version }}"
146+
stackhpc_repo_rocky_9_security_version: "{{ stackhpc_repo_distribution }}"
147+
144148
# Rocky 9 SIG Security Common
145149
stackhpc_repo_rocky_9_sig_security_common_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/sig/9/security/$basearch/security-common/{{ stackhpc_repo_rocky_9_sig_security_common_version }}"
146150
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_repo_distribution }}"
@@ -173,6 +177,10 @@ stackhpc_repo_rocky_10_crb_version: "{{ stackhpc_repo_distribution }}"
173177
stackhpc_repo_rocky_10_highavailability_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_10_url_version }}/highavailability/$basearch/os/{{ stackhpc_repo_rocky_10_highavailability_version }}"
174178
stackhpc_repo_rocky_10_highavailability_version: "{{ stackhpc_repo_distribution }}"
175179

180+
# Rocky 10 Security
181+
stackhpc_repo_rocky_10_security_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_10_url_version }}/security/$basearch/os/{{ stackhpc_repo_rocky_10_security_version }}"
182+
stackhpc_repo_rocky_10_security_version: "{{ stackhpc_repo_distribution }}"
183+
176184
# CentOS Stream 10 - NFV OpenvSwitch
177185
stackhpc_repo_centos_stream_10_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/10-stream/nfv/$basearch/openvswitch-2/{{ stackhpc_repo_centos_stream_10_nfv_openvswitch_version }}"
178186
stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
features:
3+
- |
4+
Adds support for the `Rocky Linux security repository
5+
<https://forums.rockylinux.org/t/rocky-linux-security-repository-and-dirty-frag-security-update/20435>`__.
6+
This repository is disabled by default, like in Rocky Linux. It can be
7+
enabled by setting ``dnf_enable_rocky_security`` to ``true``.

0 commit comments

Comments
 (0)