From 106b4c7a2086025d3e2be38e4a2456f9eafa9177 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 13 Sep 2024 09:46:21 +0100 Subject: [PATCH 01/12] Rebuild Ubuntu Kolla images for Caracal --- etc/kayobe/kolla-image-tags.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 424cc8f73..a60da77ab 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -5,10 +5,9 @@ kolla_image_tags: openstack: rocky-9: 2024.1-rocky-9-20240903T113235 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240725T165045 + ubuntu-jammy: 2024.1-ubuntu-jammy-20240912T142033 heat: rocky-9: 2024.1-rocky-9-20240805T142526 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240805T142526 nova: rocky-9: 2024.1-rocky-9-20240918T164436 ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436 @@ -20,12 +19,10 @@ kolla_image_tags: ubuntu-jammy: 2024.1-ubuntu-jammy-20240926T144142 horizon: rocky-9: 2024.1-rocky-9-20240909T144917 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240909T144917 bifrost_deploy: rocky-9: 2024.1-rocky-9-20240725T165045 prometheus: rocky-9: 2024.1-rocky-9-20240910T072617 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240910T072617 rabbitmq: rocky-9: 2024.1-rocky-9-20240927T152945 ironic: From e930dcd8118743f7ce33b87c0f0510d977070881 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 13 Sep 2024 09:49:36 +0100 Subject: [PATCH 02/12] Rebuild rocky linux ironic images for Caracal --- etc/kayobe/kolla-image-tags.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index a60da77ab..41b2579a8 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -19,6 +19,8 @@ kolla_image_tags: ubuntu-jammy: 2024.1-ubuntu-jammy-20240926T144142 horizon: rocky-9: 2024.1-rocky-9-20240909T144917 + ironic: + rocky-9: 2024.1-rocky-9-20240913T082332 bifrost_deploy: rocky-9: 2024.1-rocky-9-20240725T165045 prometheus: From af56a5d9d65afca7e57ab13700de521449c4a636 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 17 Sep 2024 10:13:06 +0100 Subject: [PATCH 03/12] Update Ubuntu base image for container build --- etc/kayobe/kolla/kolla-build.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla/kolla-build.conf b/etc/kayobe/kolla/kolla-build.conf index 88f3d3164..96699c2f7 100644 --- a/etc/kayobe/kolla/kolla-build.conf +++ b/etc/kayobe/kolla/kolla-build.conf @@ -3,7 +3,7 @@ {# snapshots, so pin to a specific tag. #} {# This tag should be updated when Ubuntu package repo snapshot versions are changed. #} {% if kolla_base_distro == 'ubuntu' %} -base_tag = jammy-20231004 +base_tag = jammy-20240808 {# Similarly pinning to Rocky 9 minor version used in our repos #} {% elif kolla_base_distro == 'rocky' %} base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }} From bcd2de59dc678313fdbfbb3ffd6a60cb340e968b Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 17 Sep 2024 16:02:42 +0100 Subject: [PATCH 04/12] Build Caracal kolla images with correct ubuntu base image --- etc/kayobe/kolla-image-tags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 41b2579a8..59c7a85dd 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -5,7 +5,7 @@ kolla_image_tags: openstack: rocky-9: 2024.1-rocky-9-20240903T113235 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240912T142033 + ubuntu-jammy: 2024.1-ubuntu-jammy-20240917T091559 heat: rocky-9: 2024.1-rocky-9-20240805T142526 nova: From 82642854234434e185f9e770b481d31b416628a5 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 4 Oct 2024 18:41:43 +0100 Subject: [PATCH 05/12] Bump nova, neutron and octavia tags --- etc/kayobe/kolla-image-tags.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 59c7a85dd..74b2f5e13 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -9,14 +9,14 @@ kolla_image_tags: heat: rocky-9: 2024.1-rocky-9-20240805T142526 nova: - rocky-9: 2024.1-rocky-9-20240918T164436 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436 + rocky-9: 2024.1-rocky-9-20241004T094540 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 neutron: - rocky-9: 2024.1-rocky-9-20240918T164436 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240918T164436 + rocky-9: 2024.1-rocky-9-20241004T094540 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 octavia: - rocky-9: 2024.1-rocky-9-20240926T144142 - ubuntu-jammy: 2024.1-ubuntu-jammy-20240926T144142 + rocky-9: 2024.1-rocky-9-20241004T094540 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 horizon: rocky-9: 2024.1-rocky-9-20240909T144917 ironic: From 8aa0a5ed7349b8a10b5ca66cd133a52dda150591 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Mon, 7 Oct 2024 09:29:59 +0100 Subject: [PATCH 06/12] Bump Ironic tag I also built dnsmasq. The lack of which was causing jobs to fail. --- etc/kayobe/kolla-image-tags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 74b2f5e13..7f5b24437 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -20,7 +20,7 @@ kolla_image_tags: horizon: rocky-9: 2024.1-rocky-9-20240909T144917 ironic: - rocky-9: 2024.1-rocky-9-20240913T082332 + rocky-9: 2024.1-rocky-9-20241004T183935 bifrost_deploy: rocky-9: 2024.1-rocky-9-20240725T165045 prometheus: From fc603d69f6276dfefae0c5798442660d2a06bb54 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Wed, 23 Oct 2024 15:31:25 +0100 Subject: [PATCH 07/12] Remove duplicated ironic tag --- etc/kayobe/kolla-image-tags.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 7f5b24437..0722592af 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -19,8 +19,6 @@ kolla_image_tags: ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 horizon: rocky-9: 2024.1-rocky-9-20240909T144917 - ironic: - rocky-9: 2024.1-rocky-9-20241004T183935 bifrost_deploy: rocky-9: 2024.1-rocky-9-20240725T165045 prometheus: From b56a05e9bb9c7f7d425e580e9b441b9c36b1f425 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Wed, 23 Oct 2024 15:54:12 +0100 Subject: [PATCH 08/12] Bump Ironic to apply OSSA-2024-004 fix --- etc/kayobe/kolla-image-tags.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 0722592af..67a91b31b 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -26,11 +26,11 @@ kolla_image_tags: rabbitmq: rocky-9: 2024.1-rocky-9-20240927T152945 ironic: - rocky-9: 2024.1-rocky-9-20241022T090648 - ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648 + rocky-9: 2024.1-rocky-9-20241023T143407 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241023T143407 ironic_dnsmasq: - rocky-9: 2024.1-rocky-9-20241022T090648 - ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648 + rocky-9: 2024.1-rocky-9-20241023T143407 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241023T143407 ironic_neutron_agent: - rocky-9: 2024.1-rocky-9-20241022T090648 - ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648 + rocky-9: 2024.1-rocky-9-20241023T143407 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241023T143407 From 397f072a03ad2b17be26b10f993c6228f8574db2 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 25 Oct 2024 10:30:08 +0100 Subject: [PATCH 09/12] Bump Neutron image tags --- etc/kayobe/kolla-image-tags.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 67a91b31b..68c331aba 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -12,8 +12,8 @@ kolla_image_tags: rocky-9: 2024.1-rocky-9-20241004T094540 ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 neutron: - rocky-9: 2024.1-rocky-9-20241004T094540 - ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 + rocky-9: 2024.1-rocky-9-20241025T090323 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241025T090323 octavia: rocky-9: 2024.1-rocky-9-20241004T094540 ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 From b1687d0b75538038e1f93450d0acf7779d2eccaa Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 25 Oct 2024 10:43:40 +0100 Subject: [PATCH 10/12] Drop Ironic image bump TO be split into a separate PR. --- etc/kayobe/kolla-image-tags.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 68c331aba..bb70c1b75 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -26,11 +26,11 @@ kolla_image_tags: rabbitmq: rocky-9: 2024.1-rocky-9-20240927T152945 ironic: - rocky-9: 2024.1-rocky-9-20241023T143407 - ubuntu-jammy: 2024.1-ubuntu-jammy-20241023T143407 + rocky-9: 2024.1-rocky-9-20241022T090648 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648 ironic_dnsmasq: - rocky-9: 2024.1-rocky-9-20241023T143407 - ubuntu-jammy: 2024.1-ubuntu-jammy-20241023T143407 + rocky-9: 2024.1-rocky-9-20241022T090648 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648 ironic_neutron_agent: - rocky-9: 2024.1-rocky-9-20241023T143407 - ubuntu-jammy: 2024.1-ubuntu-jammy-20241023T143407 + rocky-9: 2024.1-rocky-9-20241022T090648 + ubuntu-jammy: 2024.1-ubuntu-jammy-20241022T090648 From f807da1de09dd455dd19efc4c900d78c3ee05eb7 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 25 Oct 2024 11:03:35 +0100 Subject: [PATCH 11/12] Add release note --- .../caracal-bump-container-images-083b691e83816b3b.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml diff --git a/releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml b/releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml new file mode 100644 index 000000000..ad44627f9 --- /dev/null +++ b/releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + * Bumped the base image for Ubuntu 22.04 containers. + * Additionally bumped Nova, Neutron and Octavia images for + both Rocky and Ubuntu. From 8deae29e36861f90e8e6b4e353123bc2044d8cb1 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 25 Oct 2024 11:25:07 +0100 Subject: [PATCH 12/12] Split reno list items --- .../caracal-bump-container-images-083b691e83816b3b.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml b/releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml index ad44627f9..e4070f66a 100644 --- a/releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml +++ b/releasenotes/notes/caracal-bump-container-images-083b691e83816b3b.yaml @@ -1,6 +1,7 @@ --- features: - | - * Bumped the base image for Ubuntu 22.04 containers. - * Additionally bumped Nova, Neutron and Octavia images for - both Rocky and Ubuntu. + Bumped the base image for Ubuntu 22.04 containers. + - | + Additionally bumped Nova, Neutron and Octavia images for + both Rocky and Ubuntu.