From 7cb77517e3d149afa9068a2a2bcf90d05f0b5546 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Tue, 9 Jul 2024 10:27:07 +0200 Subject: [PATCH 1/7] Updating to RL9.4 --- etc/kayobe/pulp-repo-versions.yml | 43 +++++++++++++++++-------------- etc/kayobe/pulp.yml | 4 +-- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 5d9f8325f..e75b2a2fc 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,20 +1,20 @@ --- # Do not edit! This file is autogenerated by Ansible. -stackhpc_pulp_repo_centos_stream_9_docker_version: 20240412T001239 -stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240406T233848 -stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20240417T235558 +stackhpc_pulp_repo_centos_stream_9_docker_version: 20240702T000233 +stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240708T235303 +stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20240702T000233 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318 stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20231104T015751 stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231020T014922 stackhpc_pulp_repo_elrepo_9_version: 20240214T143520 -stackhpc_pulp_repo_epel_9_version: 20240417T235558 -stackhpc_pulp_repo_grafana_version: 20240417T235558 -stackhpc_pulp_repo_opensearch_2_x_version: 20240403T011714 -stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240403T011714 -stackhpc_pulp_repo_rabbitmq_erlang_version: 20240413T235245 -stackhpc_pulp_repo_rabbitmq_server_version: 20240330T001322 -stackhpc_pulp_repo_rhel_9_influxdb_version: 20240417T000423 -stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240208T002309 +stackhpc_pulp_repo_epel_9_version: 20240708T235303 +stackhpc_pulp_repo_grafana_version: 20240708T235303 +stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533 +stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533 +stackhpc_pulp_repo_rabbitmq_erlang_version: 20240506T000343 +stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154 +stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233 +stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522 stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715 stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015 @@ -26,12 +26,17 @@ stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328 stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715 stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715 stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702 -stackhpc_pulp_repo_rocky_9_3_appstream_version: 20240416T010957 -stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240413T014042 -stackhpc_pulp_repo_rocky_9_3_crb_version: 20240413T014042 -stackhpc_pulp_repo_rocky_9_3_extras_version: 20240413T014042 -stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240404T012937 +stackhpc_pulp_repo_rocky_9_3_appstream_version: 20240508T001430 +stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240509T005935 +stackhpc_pulp_repo_rocky_9_3_crb_version: 20240429T003818 +stackhpc_pulp_repo_rocky_9_3_extras_version: 20240506T000343 +stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240510T001129 +stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240704T001154 +stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240707T011413 +stackhpc_pulp_repo_rocky_9_4_crb_version: 20240702T000233 +stackhpc_pulp_repo_rocky_9_4_extras_version: 20240707T235817 +stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240629T235004 stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240708T235303 -stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240418T070026 -stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240418T043733 -stackhpc_pulp_repo_ubuntu_jammy_version: 20240418T043733 +stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240709T043220 +stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240709T015800 +stackhpc_pulp_repo_ubuntu_jammy_version: 20240709T015800 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 83bba5e2a..0296a325d 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -204,8 +204,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. Default is 3 -stackhpc_pulp_repo_rocky_9_minor_version: 3 +# Rocky 9 minor version number. Supported values: 1, 2, 3, 4. Default is 4 +stackhpc_pulp_repo_rocky_9_minor_version: 4 # 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) }}" From 77172bedaf4964c90016dfd059bdcbbf54ad72ef Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Tue, 9 Jul 2024 13:59:48 +0200 Subject: [PATCH 2/7] Adding CVE-2024-27280 to list of allowed-vulnerabilities in Trivy --- etc/kayobe/trivy/allowed-vulnerabilities.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/trivy/allowed-vulnerabilities.yml b/etc/kayobe/trivy/allowed-vulnerabilities.yml index d2e490a74..bd2e288c2 100644 --- a/etc/kayobe/trivy/allowed-vulnerabilities.yml +++ b/etc/kayobe/trivy/allowed-vulnerabilities.yml @@ -12,6 +12,8 @@ # # barbican_api_allowed_vulnerabilities: # - CVE-2023-31047 +fluentd_allowed_vulnerabilities: + - CVE-2024-27280 ############################################################################### # Dummy variable to allow Ansible to accept this file. From bcf467a2e078312e45bcc3b909a07b6c586ee334 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 10 Jul 2024 09:32:44 +0200 Subject: [PATCH 3/7] Updating kolla container tags --- etc/kayobe/kolla-image-tags.yml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 5278636b1..73070b2fa 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -4,25 +4,5 @@ # where the key is the OS distro and the value is the tag to deploy. kolla_image_tags: openstack: - rocky-9: 2023.1-rocky-9-20240621T104542 + rocky-9: 2023.1-rocky-9-20240709T132012 ubuntu-jammy: 2023.1-ubuntu-jammy-20240621T104542 - bifrost_deploy: - rocky-9: 2023.1-rocky-9-20240423T125905 - ubuntu-jammy: 2023.1-ubuntu-jammy-20240423T125905 - cinder: - rocky-9: 2023.1-rocky-9-20240701T123544 - ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544 - glance: - rocky-9: 2023.1-rocky-9-20240701T123544 - ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544 - haproxy_ssh: - rocky-9: 2023.1-rocky-9-20240509T102329 - ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329 - letsencrypt: - rocky-9: 2023.1-rocky-9-20240509T102329 - ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329 - nova: - rocky-9: 2023.1-rocky-9-20240702T082319 - ubuntu-jammy: 2023.1-ubuntu-jammy-20240702T082319 - opensearch: - ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T094444 From 37d3b0b4d772bdc46037a135cd56a3c6bbf38bc8 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 17 Jul 2024 13:08:44 +0200 Subject: [PATCH 4/7] Added release notes. --- .../notes/add-rocky-94-repos-27caa21c77252866.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 releasenotes/notes/add-rocky-94-repos-27caa21c77252866.yaml diff --git a/releasenotes/notes/add-rocky-94-repos-27caa21c77252866.yaml b/releasenotes/notes/add-rocky-94-repos-27caa21c77252866.yaml new file mode 100644 index 000000000..0a05455ca --- /dev/null +++ b/releasenotes/notes/add-rocky-94-repos-27caa21c77252866.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + Added support for Rocky Linux 9.4 repositories and Kolla containers. + Made 9.4 the default version for Rocky Linux. + - | + Updated Rocky Linux 9.3 pulp repo versions. + Added Rocky Linux pulp repo versions. + Rebuilt Kolla containers with Rocky 9.4. From 2a09fd40bcbe38e8545dabb06ed4313a62f7d458 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 17 Jul 2024 13:17:56 +0200 Subject: [PATCH 5/7] Re-adding ubuntu-jammy container overrides. --- etc/kayobe/kolla-image-tags.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 73070b2fa..df6cea9b6 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -6,3 +6,17 @@ kolla_image_tags: openstack: rocky-9: 2023.1-rocky-9-20240709T132012 ubuntu-jammy: 2023.1-ubuntu-jammy-20240621T104542 + bifrost_deploy: + ubuntu-jammy: 2023.1-ubuntu-jammy-20240423T125905 + cinder: + ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544 + glance: + ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544 + haproxy_ssh: + ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329 + letsencrypt: + ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329 + nova: + ubuntu-jammy: 2023.1-ubuntu-jammy-20240702T082319 + opensearch: + ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T094444 From 8e0f2f28f78ac6dff7e2537f888b55c4ed61ed34 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Wed, 17 Jul 2024 16:26:29 +0200 Subject: [PATCH 6/7] Reverting Ubuntu updates --- etc/kayobe/pulp-repo-versions.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index e75b2a2fc..c72ec0ae5 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -37,6 +37,6 @@ stackhpc_pulp_repo_rocky_9_4_crb_version: 20240702T000233 stackhpc_pulp_repo_rocky_9_4_extras_version: 20240707T235817 stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240629T235004 stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240708T235303 -stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240709T043220 -stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240709T015800 -stackhpc_pulp_repo_ubuntu_jammy_version: 20240709T015800 +stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240418T070026 +stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240418T043733 +stackhpc_pulp_repo_ubuntu_jammy_version: 20240418T043733 From 68f518d8f0fe09b9ee717a9e586725579b083696 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 23 Jul 2024 11:00:39 +0100 Subject: [PATCH 7/7] Revert Rocky 9.3 snapshot updates Updating Rocky 9.4 only. --- etc/kayobe/pulp-repo-versions.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index c72ec0ae5..8315dce1b 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -26,11 +26,11 @@ stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328 stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715 stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715 stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702 -stackhpc_pulp_repo_rocky_9_3_appstream_version: 20240508T001430 -stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240509T005935 -stackhpc_pulp_repo_rocky_9_3_crb_version: 20240429T003818 -stackhpc_pulp_repo_rocky_9_3_extras_version: 20240506T000343 -stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240510T001129 +stackhpc_pulp_repo_rocky_9_3_appstream_version: 20240416T010957 +stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240413T014042 +stackhpc_pulp_repo_rocky_9_3_crb_version: 20240413T014042 +stackhpc_pulp_repo_rocky_9_3_extras_version: 20240413T014042 +stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240404T012937 stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240704T001154 stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240707T011413 stackhpc_pulp_repo_rocky_9_4_crb_version: 20240702T000233