Skip to content

Commit fa5bae3

Browse files
committed
Keep building from Ark behind a flag
1 parent 7d1c744 commit fa5bae3

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
# Whether or not to build overcloud host images from Ark
3+
stackhpc_build_overcloud_image_from_pulp_package_mirrors: true

etc/kayobe/stackhpc-overcloud-dib.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ stackhpc_overcloud_dib_elements:
3535
- "{% if os_distribution == 'ubuntu' %}sudoers{% endif %}"
3636

3737
# 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:
3941
DIB_BLOCK_DEVICE_CONFIG: "{{ stackhpc_overcloud_dib_block_device_config_uefi_lvm }}"
4042
DIB_BOOTLOADER_DEFAULT_CMDLINE: "nofb nomodeset gfxpayload=text net.ifnames=1 rd.auto"
4143
DIB_GRUB_TIMEOUT: "5"
@@ -44,10 +46,6 @@ stackhpc_overcloud_dib_env_vars:
4446
DIB_CONTAINERFILE_RUNTIME: "docker"
4547
DIB_CONTAINERFILE_NETWORK_DRIVER: "host"
4648
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 '' }}"
5149
DIB_DRACUT_ENABLED_MODULES_DEFAULT_CONFIG: "{{ stackhpc_overcloud_dib_dracut_enabled_modules_default_config }}"
5250
DIB_RELEASE: "{{ overcloud_dib_os_release }}"
5351
DIB_SUDOERS_FILENAME: "no-fqdn"
@@ -58,6 +56,12 @@ stackhpc_overcloud_dib_env_vars:
5856
# Workaround for stack user home ownership bug
5957
DIB_IMAGE_CACHE: "/tmp/yum"
6058

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+
6165
# StackHPC overcloud DIB image packages.
6266
stackhpc_overcloud_dib_packages:
6367
- "ethtool"

etc/kayobe/stackhpc-overcloud-host-images.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
# Whether or not to download overcloud host images from Ark
66
stackhpc_download_overcloud_host_images: false
77

8+
# Whether or not to build overcloud host images from Ark
9+
stackhpc_build_overcloud_image_from_pulp_package_mirrors: false
10+
811
# The overcloud host image source, defined by os_distribution, os_release,
912
# and the current stable version.
1013
stackhpc_overcloud_host_image_url: "{{ stackhpc_release_pulp_content_url_with_auth }}/kayobe-images/\

0 commit comments

Comments
 (0)