adding rl9.6

Author: GregWhiteyBialas

etc/kayobe/kolla/kolla-build.conf

@@ -15,4 +15,13 @@ build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | jo
 [openstack-base]
 type = git
 location = https://github.com/stackhpc/requirements
-reference = stackhpc/{{ openstack_release }}
+#reference = stackhpc/{{ openstack_release }}
+reference = rl9.6
+
+[etcd]
+version = 3.5.21
+sha256 = amd64:adddda4b06718e68671ffabff2f8cee48488ba61ad82900e639d108f2148501c,arm64:95bf6918623a097c0385b96f139d90248614485e781ec9bee4768dbb6c79c53f
+
+[letsencrypt-lego]
+version = v4.23.1
+sha256 = amd64:1fd60b1fd59c239bed22719a5de402cb745d1f933540cb1ec196e2c03e6e8882,arm64:1114745108343286d4bff189b4bdee3cba9d07ebcacc673860d91ab951d31e0d

etc/kayobe/pulp-repo-versions.yml

@@ -9,11 +9,11 @@ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240923T233036
 stackhpc_pulp_repo_ceph_reef_debian_version: 20240925T152022
 stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20241218T154614
 stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20250401T001425
-stackhpc_pulp_repo_elrepo_9_version: 20241129T235743
-stackhpc_pulp_repo_epel_9_version: 20241216T235733
-stackhpc_pulp_repo_grafana_version: 20241216T002739
-stackhpc_pulp_repo_opensearch_2_x_version: 20241106T010702
-stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20241106T010702
+stackhpc_pulp_repo_elrepo_9_version: 20250610T235426
+stackhpc_pulp_repo_epel_9_version: 20250615T000221
+stackhpc_pulp_repo_grafana_version: 20250615T005738
+stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
+stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20241217T002152
 stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20241217T002152
 stackhpc_pulp_repo_rhel_9_influxdb_version: 20241217T002152
@@ -47,6 +47,11 @@ stackhpc_pulp_repo_rocky_9_5_crb_version: 20241217T005008
 stackhpc_pulp_repo_rocky_9_5_extras_version: 20241216T004230
 stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20241202T003154
 stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20241127T003858
+stackhpc_pulp_repo_rocky_9_6_appstream_version: 20250614T015933
+stackhpc_pulp_repo_rocky_9_6_baseos_version: 20250614T030644
+stackhpc_pulp_repo_rocky_9_6_crb_version: 20250614T015933
+stackhpc_pulp_repo_rocky_9_6_extras_version: 20250605T150141
+stackhpc_pulp_repo_rocky_9_6_highavailability_version: 20250605T150141
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250416T042645
 stackhpc_pulp_repo_ubuntu_jammy_security_version: 20250417T070229
 stackhpc_pulp_repo_ubuntu_jammy_version: 20250417T070229
@@ -56,3 +61,7 @@ stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
 stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241213T112245
 stackhpc_pulp_repo_rhel_9_5_doca_version: 20241211T171301
 stackhpc_pulp_repo_rhel_9_5_doca_modules_version: 20250115T150314
+##### NOTE: Dummy variables, currently no RL9.6 DOCA
+stackhpc_pulp_repo_rhel_9_6_doca_modules_version: 00000000T000000
+stackhpc_pulp_repo_rhel_9_6_doca_version: 00000000T000000
+######

etc/kayobe/pulp.yml

@@ -242,8 +242,8 @@ stackhpc_pulp_distribution_deb_production: >-
 
 # Whether to sync Rocky Linux 9 packages.
 stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
-# Rocky 9 minor version number. Supported values: 1, 2, 3, 4, 5. Default is 5
-stackhpc_pulp_repo_rocky_9_minor_version: 5
+# Rocky 9 minor version number. Supported values: 1, 2, 3, 4, 5, 6. Default is 6
+stackhpc_pulp_repo_rocky_9_minor_version: 6
 # Rocky 9 Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml for the selected minor release.
 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

@@ -18,6 +18,31 @@ grafana_allowed_vulnerabilities:
   - CVE-2024-8986
 skyline_apiserver_allowed_vulnerabilities:
   - CVE-2024-33663
+influxdb_allowed_vulnerabilities:
+  - CVE-2024-45337
+magnum_conductor_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_blackbox_exporter_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_memcached_exporter_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_mysqld_exporter_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_elasticsearch_exporter_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_node_exporter_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_openstack_exporter_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_libvirt_exporter_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_cadvisor_allowed_vulnerabilities:
+  - CVE-2024-41110
+  - CVE-2024-45337
+prometheus_msteams_allowed_vulnerabilities:
+  - CVE-2024-45337
+prometheus_v2_server_allowed_vulnerabilities:
+  - CVE-2024-45337
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

releasenotes/notes/rl9.6-f46ea1230214a657.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Added support for Rocky Linux 9.6, including host packages and a full
+    container image refresh.
+upgrade:
+  - |
+    9.6 is now the default release for Rocky Linux.