Skip to content

Commit c62c8e2

Browse files
elelayshAlex-Welsh
authored andcommitted
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
1 parent 34f1bb2 commit c62c8e2

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

etc/kayobe/stackhpc-overcloud-dib.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,17 @@ 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+
# DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES=true is important for
67+
# the multinode workflow, where we need to install packages (tmux) in cloudinit
68+
# or deploy-openstack-config.yml: /etc/yum.repos.d is empty in the built image.
69+
DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES: true
6470

6571
# StackHPC overcloud DIB image packages.
6672
stackhpc_overcloud_dib_packages:

0 commit comments

Comments
 (0)