Skip to content

Commit b5e3554

Browse files
authored
Merge pull request #1164 from stackhpc/rocky-linux9.4-support
Rocky Linux 9.4 support
2 parents e5969e8 + 68f518d commit b5e3554

File tree

5 files changed

+30
-20
lines changed

5 files changed

+30
-20
lines changed

etc/kayobe/kolla-image-tags.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,19 @@
44
# where the key is the OS distro and the value is the tag to deploy.
55
kolla_image_tags:
66
openstack:
7-
rocky-9: 2023.1-rocky-9-20240621T104542
7+
rocky-9: 2023.1-rocky-9-20240709T132012
88
ubuntu-jammy: 2023.1-ubuntu-jammy-20240621T104542
99
bifrost_deploy:
10-
rocky-9: 2023.1-rocky-9-20240423T125905
1110
ubuntu-jammy: 2023.1-ubuntu-jammy-20240423T125905
1211
cinder:
13-
rocky-9: 2023.1-rocky-9-20240701T123544
1412
ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544
1513
glance:
16-
rocky-9: 2023.1-rocky-9-20240701T123544
1714
ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544
1815
haproxy_ssh:
19-
rocky-9: 2023.1-rocky-9-20240509T102329
2016
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329
2117
letsencrypt:
22-
rocky-9: 2023.1-rocky-9-20240509T102329
2318
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329
2419
nova:
25-
rocky-9: 2023.1-rocky-9-20240702T082319
2620
ubuntu-jammy: 2023.1-ubuntu-jammy-20240702T082319
2721
opensearch:
2822
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T094444

etc/kayobe/pulp-repo-versions.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22
# Do not edit! This file is autogenerated by Ansible.
3-
stackhpc_pulp_repo_centos_stream_9_docker_version: 20240412T001239
4-
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240406T233848
5-
stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20240417T235558
3+
stackhpc_pulp_repo_centos_stream_9_docker_version: 20240702T000233
4+
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240708T235303
5+
stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20240702T000233
66
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
77
stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20231104T015751
88
stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240122T172142
99
stackhpc_pulp_repo_elrepo_9_version: 20240214T143520
10-
stackhpc_pulp_repo_epel_9_version: 20240417T235558
11-
stackhpc_pulp_repo_grafana_version: 20240417T235558
12-
stackhpc_pulp_repo_opensearch_2_x_version: 20240403T011714
13-
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240403T011714
14-
stackhpc_pulp_repo_rabbitmq_erlang_version: 20240413T235245
15-
stackhpc_pulp_repo_rabbitmq_server_version: 20240330T001322
16-
stackhpc_pulp_repo_rhel_9_influxdb_version: 20240417T000423
17-
stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240208T002309
10+
stackhpc_pulp_repo_epel_9_version: 20240708T235303
11+
stackhpc_pulp_repo_grafana_version: 20240708T235303
12+
stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533
13+
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533
14+
stackhpc_pulp_repo_rabbitmq_erlang_version: 20240506T000343
15+
stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154
16+
stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
17+
stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522
1818
stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511
1919
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
2020
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
@@ -31,6 +31,11 @@ stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240413T014042
3131
stackhpc_pulp_repo_rocky_9_3_crb_version: 20240413T014042
3232
stackhpc_pulp_repo_rocky_9_3_extras_version: 20240413T014042
3333
stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240404T012937
34+
stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240704T001154
35+
stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240707T011413
36+
stackhpc_pulp_repo_rocky_9_4_crb_version: 20240702T000233
37+
stackhpc_pulp_repo_rocky_9_4_extras_version: 20240707T235817
38+
stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240629T235004
3439
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240708T235303
3540
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240418T070026
3641
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240418T043733

etc/kayobe/pulp.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ stackhpc_pulp_distribution_deb_production: >-
204204

205205
# Whether to sync Rocky Linux 9 packages.
206206
stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
207-
# Rocky 9 minor version number. Supported values: 1, 2, 3. Default is 3
208-
stackhpc_pulp_repo_rocky_9_minor_version: 3
207+
# Rocky 9 minor version number. Supported values: 1, 2, 3, 4. Default is 4
208+
stackhpc_pulp_repo_rocky_9_minor_version: 4
209209
# Rocky 9 Snapshot versions. The defaults use the appropriate version from
210210
# pulp-repo-versions.yml for the selected minor release.
211211
stackhpc_pulp_repo_rocky_9_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_appstream_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"

etc/kayobe/trivy/allowed-vulnerabilities.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#
1313
# barbican_api_allowed_vulnerabilities:
1414
# - CVE-2023-31047
15+
fluentd_allowed_vulnerabilities:
16+
- CVE-2024-27280
1517

1618
###############################################################################
1719
# Dummy variable to allow Ansible to accept this file.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
features:
3+
- |
4+
Added support for Rocky Linux 9.4 repositories and Kolla containers.
5+
Made 9.4 the default version for Rocky Linux.
6+
- |
7+
Updated Rocky Linux 9.3 pulp repo versions.
8+
Added Rocky Linux pulp repo versions.
9+
Rebuilt Kolla containers with Rocky 9.4.

0 commit comments

Comments
 (0)