@@ -35,7 +35,9 @@ stackhpc_overcloud_dib_elements:
35
35
- " {% if os_distribution == 'ubuntu' %}sudoers{% endif %}"
36
36
37
37
# StackHPC overcloud DIB image environment variables.
38
- stackhpc_overcloud_dib_env_vars :
38
+ stackhpc_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 {}) }}"
39
+
40
+ stackhpc_overcloud_dib_env_vars_default :
39
41
DIB_BLOCK_DEVICE_CONFIG : " {{ stackhpc_overcloud_dib_block_device_config_uefi_lvm }}"
40
42
DIB_BOOTLOADER_DEFAULT_CMDLINE : " nofb nomodeset gfxpayload=text net.ifnames=1 rd.auto"
41
43
DIB_GRUB_TIMEOUT : " 5"
@@ -44,10 +46,6 @@ stackhpc_overcloud_dib_env_vars:
44
46
DIB_CONTAINERFILE_RUNTIME : " docker"
45
47
DIB_CONTAINERFILE_NETWORK_DRIVER : " host"
46
48
DIB_CONTAINERFILE_DOCKERFILE : " /opt/kayobe/src/stackhpc-image-elements/elements/rocky-container-stackhpc/containerfiles/9-stackhpc"
47
- DIB_CONTAINERFILE_BUILDOPTS : >-
48
- --build-arg=ROCKY_USE_MIRRORS=true
49
- --build-arg=ROCKY_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }}
50
- DIB_DISTRIBUTION_MIRROR : " {{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}"
51
49
DIB_DRACUT_ENABLED_MODULES_DEFAULT_CONFIG : " {{ stackhpc_overcloud_dib_dracut_enabled_modules_default_config }}"
52
50
DIB_RELEASE : " {{ overcloud_dib_os_release }}"
53
51
DIB_SUDOERS_FILENAME : " no-fqdn"
@@ -58,6 +56,12 @@ stackhpc_overcloud_dib_env_vars:
58
56
# Workaround for stack user home ownership bug
59
57
DIB_IMAGE_CACHE : " /tmp/yum"
60
58
59
+ stackhpc_overcloud_dib_env_vars_ark :
60
+ DIB_CONTAINERFILE_BUILDOPTS : >-
61
+ --build-arg=ROCKY_USE_MIRRORS=true
62
+ --build-arg=ROCKY_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }}
63
+ DIB_DISTRIBUTION_MIRROR : " {{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}"
64
+
61
65
# StackHPC overcloud DIB image packages.
62
66
stackhpc_overcloud_dib_packages :
63
67
- " ethtool"
0 commit comments