diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 0abaeffaf..79f55f089 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -13,16 +13,24 @@ kolla_base_distro: "{% raw %}{{ 'centos' if ansible_facts.distribution == 'Rocky kayobe_image_tags: openstack: centos: yoga-20231024T093507 - rocky: yoga-20231024T093507 + rocky: yoga-20231218T141822 ubuntu: yoga-20231024T093507 + cloudkitty: + centos: yoga-20231107T165648 + rocky: yoga-20231218T141822 + ubuntu: yoga-20231107T165648 + neutron: + centos: yoga-20231114T125927 + rocky: yoga-20240105T120257 + ubuntu: yoga-20231114T125927 nova: centos: yoga-20231113T171023 - rocky: yoga-20231103T161400 + rocky: yoga-20240105T120257 ubuntu: yoga-20231103T161400 -cloudkitty_tag: yoga-20231107T165648 +cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" +neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}" nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}" -neutron_tag: yoga-20231114T125927 opensearch_tag: yoga-20231219T221916 # These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index f7ecb093b..407aaf298 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -53,11 +53,16 @@ stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231020T014922 stackhpc_pulp_repo_rocky_9_1_crb_version: 20231020T014922 stackhpc_pulp_repo_rocky_9_1_extras_version: 20231020T014922 stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231018T041416 -stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_crb_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_extras_version: 20231001T002904 -stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230918T015928 +stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328 +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: 20231215T005810 +stackhpc_pulp_repo_rocky_9_3_baseos_version: 20231215T005810 +stackhpc_pulp_repo_rocky_9_3_crb_version: 20231215T005810 +stackhpc_pulp_repo_rocky_9_3_extras_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231214T005538 stackhpc_pulp_repo_treasuredata_4_version: 20230903T003752 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502 stackhpc_pulp_repo_ubuntu_focal_security_version: 20231018T165217 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 884bf679b..3e268a662 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -232,8 +232,8 @@ stackhpc_pulp_sync_el_8: "{{ stackhpc_pulp_sync_rocky_8 or stackhpc_pulp_sync_ce # Whether to sync Rocky Linux 9 packages. stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' and os_release == '9' }}" -# Rocky 9 minor version number. Supported values: 1, 2. Default is 2 -stackhpc_pulp_repo_rocky_9_minor_version: 2 +# Rocky 9 minor version number. Supported values: 1, 2, 3. Default is 3 +stackhpc_pulp_repo_rocky_9_minor_version: 3 # 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) }}" diff --git a/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml new file mode 100644 index 000000000..9a25d0e1e --- /dev/null +++ b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml @@ -0,0 +1,9 @@ +--- +features: + - | + Added support for Rocky Linux 9.3 repositories and Kolla containers. + Made 9.3 the default version for Rocky Linux. + - | + Updated Rocky Linux 9.2 pulp repo versions. + Added Rocky Linux 9.3 pulp repo versions. + Rebuilt Kolla containers with Rocky Linux 9.3.