From c62c8e2b77264e7db88d1621e6fefcf29c8f0dbe Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Fri, 12 Dec 2025 15:51:37 +0100 Subject: [PATCH 1/4] Fix empty yum.repos.d in overcloud host image no repos causes installation of tmux fail in terraform-kayobe-multinode. This regression was introduced by commit e0d1d6d --- etc/kayobe/stackhpc-overcloud-dib.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index 63c769fb3..e609e8f8b 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -56,11 +56,17 @@ stackhpc_overcloud_dib_env_vars_default: # Workaround for stack user home ownership bug DIB_IMAGE_CACHE: "/tmp/yum" +# NB: use --build-arg to pass arguments only to the Dockerfile. +# Use stackhpc_overcloud_dib_env_vars_ark keys directly for elements (eg 80-cleanup-and-restore-repofiles) stackhpc_overcloud_dib_env_vars_ark: DIB_CONTAINERFILE_BUILDOPTS: >- --build-arg=ROCKY_USE_CUSTOM_DNF_MIRRORS=true --build-arg=ROCKY_CUSTOM_DNF_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }} DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}" + # DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES=true is important for + # the multinode workflow, where we need to install packages (tmux) in cloudinit + # or deploy-openstack-config.yml: /etc/yum.repos.d is empty in the built image. + DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES: true # StackHPC overcloud DIB image packages. stackhpc_overcloud_dib_packages: From 6fbedb276f5cf5a3c4642014a4053622dc8ce2e9 Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Tue, 16 Dec 2025 14:57:18 +0100 Subject: [PATCH 2/4] bump rocky9 overcloud host image --- etc/kayobe/pulp-host-image-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/pulp-host-image-versions.yml b/etc/kayobe/pulp-host-image-versions.yml index 0a368bc9f..71292d934 100644 --- a/etc/kayobe/pulp-host-image-versions.yml +++ b/etc/kayobe/pulp-host-image-versions.yml @@ -1,5 +1,5 @@ --- # Overcloud host image versioning tags # These images must be in SMS, since they are used by our AIO CI runners -stackhpc_rocky_9_overcloud_host_image_version: "2025.1-20251027T102633" +stackhpc_rocky_9_overcloud_host_image_version: "2025.1-20251216T122459" stackhpc_ubuntu_noble_overcloud_host_image_version: "2025.1-20250930T144255" From 27d87897de671e306602a25deda4bff8851aea56 Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Tue, 16 Dec 2025 17:45:32 +0100 Subject: [PATCH 3/4] fix comment in stackhpc-overcloud-dib.yml following review Co-authored-by: Alex Welsh <112560678+Alex-Welsh@users.noreply.github.com> --- etc/kayobe/stackhpc-overcloud-dib.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index e609e8f8b..03b2700fe 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -63,9 +63,7 @@ stackhpc_overcloud_dib_env_vars_ark: --build-arg=ROCKY_USE_CUSTOM_DNF_MIRRORS=true --build-arg=ROCKY_CUSTOM_DNF_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }} DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}" - # DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES=true is important for - # the multinode workflow, where we need to install packages (tmux) in cloudinit - # or deploy-openstack-config.yml: /etc/yum.repos.d is empty in the built image. + # Ensure upstream repofiles are re-enabled after image build, otherwise `yum.repos.d` is left empty DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES: true # StackHPC overcloud DIB image packages. From d572a80a778b8c8a9fb0041268bf4a739083f304 Mon Sep 17 00:00:00 2001 From: Eric Le Lay Date: Tue, 16 Dec 2025 17:46:23 +0100 Subject: [PATCH 4/4] Add release note restore-rocky-repos --- releasenotes/notes/restore-rocky-repos-c33ee54809836851.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 releasenotes/notes/restore-rocky-repos-c33ee54809836851.yaml diff --git a/releasenotes/notes/restore-rocky-repos-c33ee54809836851.yaml b/releasenotes/notes/restore-rocky-repos-c33ee54809836851.yaml new file mode 100644 index 000000000..8ff54176d --- /dev/null +++ b/releasenotes/notes/restore-rocky-repos-c33ee54809836851.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + The default Rocky 9 overcloud host image has been updated to include + upstream package repos out of the box