@@ -37,12 +37,18 @@ stackhpc_overcloud_dib_elements:
3737# StackHPC overcloud DIB image environment variables.
3838stackhpc_overcloud_dib_env_vars : " {{ stackhpc_overcloud_dib_env_vars_default | combine(stackhpc_overcloud_dib_env_vars_ark if stackhpc_build_overcloud_image_from_pulp_package_mirrors | bool else {}) }}"
3939
40+ # By default the :9 tag is used as base image. Here we want a specific minor version.
41+ stackhpc_overcloud_dib_container_opts_default : >-
42+ --build-arg=ROCKY_VERSION=9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
43+
4044stackhpc_overcloud_dib_env_vars_default :
4145 DIB_BLOCK_DEVICE_CONFIG : " {{ stackhpc_overcloud_dib_block_device_config_uefi_lvm }}"
4246 DIB_BOOTLOADER_DEFAULT_CMDLINE : " nofb nomodeset gfxpayload=text net.ifnames=1 rd.auto"
4347 DIB_GRUB_TIMEOUT : " 5"
4448 DIB_GRUB_TIMEOUT_STYLE : " menu"
4549 DIB_CLOUD_INIT_DATASOURCES : " OpenStack, ConfigDrive"
50+ DIB_CONTAINERFILE_BUILDOPTS : >-
51+ {{ stackhpc_overcloud_dib_container_opts_default }}
4652 DIB_CONTAINERFILE_RUNTIME : " docker"
4753 DIB_CONTAINERFILE_NETWORK_DRIVER : " host"
4854 DIB_CONTAINERFILE_DOCKERFILE : " /opt/kayobe/src/stackhpc-image-elements/elements/rocky-container-stackhpc/containerfiles/9-stackhpc"
@@ -62,6 +68,7 @@ stackhpc_overcloud_dib_env_vars_ark:
6268 DIB_CONTAINERFILE_BUILDOPTS : >-
6369 --build-arg=ROCKY_USE_CUSTOM_DNF_MIRRORS=true
6470 --build-arg=ROCKY_CUSTOM_DNF_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }}
71+ {{ stackhpc_overcloud_dib_container_opts_default }}
6572 DIB_DISTRIBUTION_MIRROR : " {{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}"
6673 # Ensure upstream repofiles are re-enabled after image build, otherwise `yum.repos.d` is left empty
6774 DIB_ROCKY_CONTAINER_STACKHPC_RESTORE_UPSTREAM_REPOFILES : true
0 commit comments