Skip to content

Commit 0bf9129

Browse files
elelayshAlex-Welsh
andauthored
Fix empty yum.repos.d in overcloud host image (#2041)
* 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 * bump rocky9 overcloud host image * fix comment in stackhpc-overcloud-dib.yml following review Co-authored-by: Alex Welsh <112560678+Alex-Welsh@users.noreply.github.com> * Add release note restore-rocky-repos --------- Co-authored-by: Alex Welsh <112560678+Alex-Welsh@users.noreply.github.com>
1 parent d899fa9 commit 0bf9129

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
# Overcloud host image versioning tags
33
# These images must be in SMS, since they are used by our AIO CI runners
4-
stackhpc_rocky_9_overcloud_host_image_version: "2025.1-20251027T102633"
4+
stackhpc_rocky_9_overcloud_host_image_version: "2025.1-20251216T122459"
55
stackhpc_ubuntu_noble_overcloud_host_image_version: "2025.1-20250930T144255"

etc/kayobe/stackhpc-overcloud-dib.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,15 @@ stackhpc_overcloud_dib_env_vars_default:
5656
# Workaround for stack user home ownership bug
5757
DIB_IMAGE_CACHE: "/tmp/yum"
5858

59+
# NB: use --build-arg to pass arguments only to the Dockerfile.
60+
# Use stackhpc_overcloud_dib_env_vars_ark keys directly for elements (eg 80-cleanup-and-restore-repofiles)
5961
stackhpc_overcloud_dib_env_vars_ark:
6062
DIB_CONTAINERFILE_BUILDOPTS: >-
6163
--build-arg=ROCKY_USE_CUSTOM_DNF_MIRRORS=true
6264
--build-arg=ROCKY_CUSTOM_DNF_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }}
6365
DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}"
66+
# Ensure upstream repofiles are re-enabled after image build, otherwise `yum.repos.d` is left empty
67+
DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES: true
6468

6569
# StackHPC overcloud DIB image packages.
6670
stackhpc_overcloud_dib_packages:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
The default Rocky 9 overcloud host image has been updated to include
5+
upstream package repos out of the box

0 commit comments

Comments
 (0)