Skip to content

Commit 6d4d9b0

Browse files
Merge branch 'add-doca-2.9.1' into add-doca-repo
2 parents 3db8289 + d77a318 commit 6d4d9b0

File tree

4 files changed

+162
-63
lines changed

4 files changed

+162
-63
lines changed

ansible/inventory/group_vars/all/package-repos

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ rpm_package_repos:
213213
policy: on_demand
214214
base_path: grafana/oss/rpm/
215215
short_name: grafana
216-
sync_group: third_party
216+
sync_group: grafana
217217
distribution_name: grafana-
218218
- name: MariaDB 10.5
219219
url: https://dlm.mariadb.com/repo/mariadb-server/10.5/yum/rhel/8/x86_64
@@ -254,70 +254,70 @@ rpm_package_repos:
254254
sync_group: third_party
255255
distribution_name: treasuredata-4-
256256

257-
# Base Rocky Linux 9.4 repositories
258-
- name: Rocky Linux 9.4 - AppStream
259-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.4&arch=x86_64&country=NL&protocol=https
260-
base_path: rocky/9.4/AppStream/x86_64/os/
261-
short_name: rocky_9_4_appstream
257+
# Base Rocky Linux 9.5 repositories
258+
- name: Rocky Linux 9.5 - AppStream
259+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.5&arch=x86_64&country=NL&protocol=https
260+
base_path: rocky/9.5/AppStream/x86_64/os/
261+
short_name: rocky_9_5_appstream
262262
sync_group: rocky_9
263-
distribution_name: rocky-9.4-appstream-
264-
- name: Rocky Linux 9.4 - AppStream (aarch64)
265-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.4&arch=aarch64&country=NL&protocol=https
266-
base_path: rocky/9.4/AppStream/aarch64/os/
267-
short_name: rocky_9_4_appstream_aarch64
263+
distribution_name: rocky-9.5-appstream-
264+
- name: Rocky Linux 9.5 - AppStream (aarch64)
265+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.5&arch=aarch64&country=NL&protocol=https
266+
base_path: rocky/9.5/AppStream/aarch64/os/
267+
short_name: rocky_9_5_appstream_aarch64
268268
sync_group: rocky_9_aarch64
269-
distribution_name: rocky-9.4-appstream-aarch64-
270-
- name: Rocky Linux 9.4 - BaseOS
271-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.4&arch=x86_64&country=NL&protocol=https
272-
base_path: rocky/9.4/BaseOS/x86_64/os/
273-
short_name: rocky_9_4_baseos
269+
distribution_name: rocky-9.5-appstream-aarch64-
270+
- name: Rocky Linux 9.5 - BaseOS
271+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.5&arch=x86_64&country=NL&protocol=https
272+
base_path: rocky/9.5/BaseOS/x86_64/os/
273+
short_name: rocky_9_5_baseos
274274
sync_group: rocky_9_baseos
275-
distribution_name: rocky-9.4-baseos-
276-
- name: Rocky Linux 9.4 - BaseOS (aarch64)
277-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.4&arch=aarch64&country=NL&protocol=https
278-
base_path: rocky/9.4/BaseOS/aarch64/os/
279-
short_name: rocky_9_4_baseos_aarch64
275+
distribution_name: rocky-9.5-baseos-
276+
- name: Rocky Linux 9.5 - BaseOS (aarch64)
277+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.5&arch=aarch64&country=NL&protocol=https
278+
base_path: rocky/9.5/BaseOS/aarch64/os/
279+
short_name: rocky_9_5_baseos_aarch64
280280
sync_group: rocky_9_aarch64
281-
distribution_name: rocky-9.4-baseos-aarch64-
282-
- name: Rocky Linux 9.4 - Extras
283-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.4&arch=x86_64&country=NL&protocol=https
284-
base_path: rocky/9.4/extras/x86_64/os/
285-
short_name: rocky_9_4_extras
281+
distribution_name: rocky-9.5-baseos-aarch64-
282+
- name: Rocky Linux 9.5 - Extras
283+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.5&arch=x86_64&country=NL&protocol=https
284+
base_path: rocky/9.5/extras/x86_64/os/
285+
short_name: rocky_9_5_extras
286286
sync_group: rocky_9
287-
distribution_name: rocky-9.4-extras-
288-
- name: Rocky Linux 9.4 - Extras (aarch64)
289-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.4&arch=aarch64&country=NL&protocol=https
290-
base_path: rocky/9.4/extras/aarch64/os/
291-
short_name: rocky_9_4_extras_aarch64
287+
distribution_name: rocky-9.5-extras-
288+
- name: Rocky Linux 9.5 - Extras (aarch64)
289+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.5&arch=aarch64&country=NL&protocol=https
290+
base_path: rocky/9.5/extras/aarch64/os/
291+
short_name: rocky_9_5_extras_aarch64
292292
sync_group: rocky_9_aarch64
293-
distribution_name: rocky-9.4-extras-aarch64-
293+
distribution_name: rocky-9.5-extras-aarch64-
294294

295-
# Additional Rocky Linux 9.4 repositories
295+
# Additional Rocky Linux 9.5 repositories
296296
# No advanced virt, Ceph or OpenStack
297-
- name: Rocky Linux 9.4 - CRB
298-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.4&arch=x86_64&country=NL&protocol=https
299-
base_path: rocky/9.4/CRB/x86_64/os/
300-
short_name: rocky_9_4_crb
297+
- name: Rocky Linux 9.5 - CRB
298+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.5&arch=x86_64&country=NL&protocol=https
299+
base_path: rocky/9.5/CRB/x86_64/os/
300+
short_name: rocky_9_5_crb
301301
sync_group: rocky_9
302-
distribution_name: rocky-9.4-crb-
303-
- name: Rocky Linux 9.4 - CRB (aarch64)
304-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.4&arch=aarch64&country=NL&protocol=https
305-
base_path: rocky/9.4/CRB/aarch64/os/
306-
short_name: rocky_9_4_crb_aarch64
302+
distribution_name: rocky-9.5-crb-
303+
- name: Rocky Linux 9.5 - CRB (aarch64)
304+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.5&arch=aarch64&country=NL&protocol=https
305+
base_path: rocky/9.5/CRB/aarch64/os/
306+
short_name: rocky_9_5_crb_aarch64
307307
sync_group: rocky_9_aarch64
308-
distribution_name: rocky-9.4-crb-aarch64-
309-
- name: Rocky Linux 9.4 - HighAvailability
310-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.4&arch=x86_64&country=NL&protocol=https
311-
base_path: rocky/9.4/highavailability/x86_64/os/
312-
short_name: rocky_9_4_highavailability
308+
distribution_name: rocky-9.5-crb-aarch64-
309+
- name: Rocky Linux 9.5 - HighAvailability
310+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.5&arch=x86_64&country=NL&protocol=https
311+
base_path: rocky/9.5/highavailability/x86_64/os/
312+
short_name: rocky_9_5_highavailability
313313
sync_group: rocky_9
314-
distribution_name: rocky-9.4-highavailability-
315-
- name: Rocky Linux 9.4 - HighAvailability (aarch64)
316-
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.4&arch=aarch64&country=NL&protocol=https
317-
base_path: rocky/9.4/highavailability/aarch64/os/
318-
short_name: rocky_9_4_highavailability_aarch64
314+
distribution_name: rocky-9.5-highavailability-
315+
- name: Rocky Linux 9.5 - HighAvailability (aarch64)
316+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.5&arch=aarch64&country=NL&protocol=https
317+
base_path: rocky/9.5/highavailability/aarch64/os/
318+
short_name: rocky_9_5_highavailability_aarch64
319319
sync_group: rocky_9_aarch64
320-
distribution_name: rocky-9.4-highavailability-aarch64-
320+
distribution_name: rocky-9.5-highavailability-aarch64-
321321
- name: Rocky Linux 9 - SIG Security Common
322322
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-sig-security-common-9&arch=x86_64&country=NL&protocol=https
323323
base_path: rocky/sig/9/security/x86_64/security-common/
@@ -585,13 +585,13 @@ rpm_package_repos:
585585
short_name: opensearch_dashboards_2_x
586586
sync_group: third_party
587587
distribution_name: opensearch_dashboards-2.x-yum-
588-
# DOCA Repository for RHEL 9.4
589-
- name: DOCA Online Repo 2.8.0 - RHEL 9.4
590-
url: https://linux.mellanox.com/public/repo/doca/2.8.0/rhel9.4/x86_64/
591-
base_path: doca/2.8.0/rhel9.4/x86_64/
592-
short_name: doca_2_8_0_rhel9_4
588+
# DOCA Repository 2.9.1 for RHEL 9.5
589+
- name: DOCA Online Repo 2.9.1 - RHEL 9.5
590+
url: https://linux.mellanox.com/public/repo/doca/2.9.1/rhel9.5/x86_64/
591+
base_path: doca/2.9.1/rhel9.5/x86_64/
592+
short_name: doca_2_9_1_rhel9_5
593593
sync_group: third_party
594-
distribution_name: doca-2.8.0-rhel9.4-
594+
distribution_name: doca-2.9.1-rhel9.5-
595595

596596
# Default filter string for RPM package repositories.
597597
rpm_package_repo_filter: ""

ansible/inventory/group_vars/all/package-repos-deprecated

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,3 +511,86 @@ deprecated_rpm_package_repos:
511511
sync_group: rocky_9
512512
distribution_name: rocky-9.3-highavailability-
513513
sync: false
514+
515+
# Base Rocky Linux 9.4 repositories
516+
- name: Rocky Linux 9.4 - AppStream
517+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.4&arch=x86_64&country=NL&protocol=https
518+
base_path: rocky/9.4/AppStream/x86_64/os/
519+
short_name: rocky_9_4_appstream
520+
sync_group: rocky_9
521+
distribution_name: rocky-9.4-appstream-
522+
- name: Rocky Linux 9.4 - AppStream (aarch64)
523+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-AppStream-9.4&arch=aarch64&country=NL&protocol=https
524+
base_path: rocky/9.4/AppStream/aarch64/os/
525+
short_name: rocky_9_4_appstream_aarch64
526+
sync_group: rocky_9_aarch64
527+
distribution_name: rocky-9.4-appstream-aarch64-
528+
- name: Rocky Linux 9.4 - BaseOS
529+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.4&arch=x86_64&country=NL&protocol=https
530+
base_path: rocky/9.4/BaseOS/x86_64/os/
531+
short_name: rocky_9_4_baseos
532+
sync_group: rocky_9_baseos
533+
distribution_name: rocky-9.4-baseos-
534+
- name: Rocky Linux 9.4 - BaseOS (aarch64)
535+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-BaseOS-9.4&arch=aarch64&country=NL&protocol=https
536+
base_path: rocky/9.4/BaseOS/aarch64/os/
537+
short_name: rocky_9_4_baseos_aarch64
538+
sync_group: rocky_9_aarch64
539+
distribution_name: rocky-9.4-baseos-aarch64-
540+
- name: Rocky Linux 9.4 - Extras
541+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.4&arch=x86_64&country=NL&protocol=https
542+
base_path: rocky/9.4/extras/x86_64/os/
543+
short_name: rocky_9_4_extras
544+
sync_group: rocky_9
545+
distribution_name: rocky-9.4-extras-
546+
- name: Rocky Linux 9.4 - Extras (aarch64)
547+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-extras-9.4&arch=aarch64&country=NL&protocol=https
548+
base_path: rocky/9.4/extras/aarch64/os/
549+
short_name: rocky_9_4_extras_aarch64
550+
sync_group: rocky_9_aarch64
551+
distribution_name: rocky-9.4-extras-aarch64-
552+
553+
# Additional Rocky Linux 9.4 repositories
554+
# No advanced virt, Ceph or OpenStack
555+
- name: Rocky Linux 9.4 - CRB
556+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.4&arch=x86_64&country=NL&protocol=https
557+
base_path: rocky/9.4/CRB/x86_64/os/
558+
short_name: rocky_9_4_crb
559+
sync_group: rocky_9
560+
distribution_name: rocky-9.4-crb-
561+
- name: Rocky Linux 9.4 - CRB (aarch64)
562+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-CRB-9.4&arch=aarch64&country=NL&protocol=https
563+
base_path: rocky/9.4/CRB/aarch64/os/
564+
short_name: rocky_9_4_crb_aarch64
565+
sync_group: rocky_9_aarch64
566+
distribution_name: rocky-9.4-crb-aarch64-
567+
- name: Rocky Linux 9.4 - HighAvailability
568+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.4&arch=x86_64&country=NL&protocol=https
569+
base_path: rocky/9.4/highavailability/x86_64/os/
570+
short_name: rocky_9_4_highavailability
571+
sync_group: rocky_9
572+
distribution_name: rocky-9.4-highavailability-
573+
- name: Rocky Linux 9.4 - HighAvailability (aarch64)
574+
url: https://mirrors.rockylinux.org/mirrorlist?repo=rocky-HighAvailability-9.4&arch=aarch64&country=NL&protocol=https
575+
base_path: rocky/9.4/highavailability/aarch64/os/
576+
short_name: rocky_9_4_highavailability_aarch64
577+
sync_group: rocky_9_aarch64
578+
distribution_name: rocky-9.4-highavailability-aarch64-
579+
580+
# Additional RHEL 9 repositories
581+
# DOCA Repository 2.8.0 for RHEL 9.4
582+
- name: DOCA Online Repo 2.8.0 - RHEL 9.4
583+
url: https://linux.mellanox.com/public/repo/doca/2.8.0/rhel9.4/x86_64/
584+
base_path: doca/2.8.0/rhel9.4/x86_64/
585+
short_name: doca_2_8_0_rhel9_4
586+
sync_group: third_party
587+
distribution_name: doca-2.8.0-rhel9.4-
588+
distribution_name: doca-2.8.0-rhel9.4-
589+
# DOCA Repository 2.9.1 for RHEL 9.4
590+
- name: DOCA Online Repo 2.9.1 - RHEL 9.4
591+
url: https://linux.mellanox.com/public/repo/doca/2.9.1/rhel9.4/x86_64/
592+
base_path: doca/2.9.1/rhel9.4/x86_64/
593+
short_name: doca_2_9_1_rhel9_4
594+
sync_group: third_party
595+
distribution_name: doca-2.9.1-rhel9.4-
596+
distribution_name: doca-2.9.1-rhel9.4-

ansible/inventory/group_vars/all/source-repositories

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ source_repositories:
107107
- yoga
108108
- zed
109109
- 2023.1
110-
- 2024.1
111110
community_files:
112111
- codeowners:
113112
content: "{{ community_files.codeowners.kayobe }}"
@@ -125,6 +124,21 @@ source_repositories:
125124
- codeowners:
126125
content: "{{ community_files.codeowners.openstack }}"
127126
dest: ".github/CODEOWNERS"
127+
blazar:
128+
additional_releases:
129+
- master
130+
ignored_releases:
131+
- victoria
132+
- wallaby
133+
- xena
134+
- yoga
135+
- zed
136+
- 2023.1
137+
- 2024.1
138+
community_files:
139+
- codeowners:
140+
content: "{{ community_files.codeowners.openstack }}"
141+
dest: ".github/CODEOWNERS"
128142
cinder:
129143
ignored_releases:
130144
- victoria

terraform/github/terraform.tfvars.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@
5252
"ansible-collection-kayobe-workflows"
5353
],
5454
"OpenStack": [
55-
"bifrost",
5655
"barbican",
56+
"bifrost",
57+
"blazar",
5758
"cinder",
5859
"cloudkitty",
5960
"cloudkitty-dashboard",
@@ -67,10 +68,11 @@
6768
"networking-generic-switch",
6869
"neutron",
6970
"nova",
71+
"octavia",
7072
"octavia-dashboard",
7173
"ovn-octavia-provider",
72-
"stackhpc-inspector-plugins",
73-
"requirements"
74+
"requirements",
75+
"stackhpc-inspector-plugins"
7476
],
7577
"Platform": [
7678
],

0 commit comments

Comments
 (0)