Update host image pulling changes after review

Author: Alex-Welsh

.github/workflows/stackhpc-all-in-one.yml

@@ -79,7 +79,7 @@ jobs:
       - name: Output image tag
         id: image_tag
         run: |
-          echo image_tag=$(grep stackhpc_${{ inputs.os_distribution }}_$(sed s/-/_/ <(echo "${{ inputs.os_release }}"))_overcloud_host_image_version: etc/kayobe/stackhpc-overcloud-host-images.yml | awk '{print $2}') >> $GITHUB_OUTPUT
+          echo image_tag=$(grep stackhpc_${{ inputs.os_distribution }}_$(sed s/-/_/ <(echo "${{ inputs.os_release }}"))_overcloud_host_image_version: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
 
       # Use the image override if set, otherwise use overcloud-os_distribution-os_release-tag
       - name: Output image name

doc/source/configuration/host-images.rst

@@ -26,7 +26,8 @@ Currently, images exist for the following operating systems:
 * Ubuntu Jammy 22.04
 
 The image to download is selected automatically using the ``os_distribution``
-and ``os_release`` variables.
+and ``os_release`` variables. These images are versioned and a variable for
+each OS is stored in ``pulp-host-image-versions.yml``.
 
 This content requires the same set of credentials as is used for other
 release train content.

doc/source/configuration/release-train.rst

@@ -38,7 +38,7 @@ This configuration provides the following:
 
 * Configuration to deploy a local Pulp service as a container on the seed
 * Pulp repository definitions for CentOS Stream 8, Rocky Linux 8/9 and Ubuntu
-  Jammy
+  Focal
 * Playbooks to synchronise a local Pulp service with Ark
 * Configuration to use the local Pulp repository mirrors on control plane hosts
 * Configuration to use the local Pulp container registry on control plane hosts

etc/kayobe/kolla/config/bifrost.yml

@@ -2,7 +2,6 @@
 ---
 # Use prebuilt release train images from Ark.
 {% if stackhpc_download_overcloud_host_images | bool %}
-overcloud_dib_build_host_images: false
 use_cirros: true
 cirros_deploy_image_upstream_url: "{{ stackhpc_overcloud_host_image_url }}"
 {% endif %}

etc/kayobe/overcloud-dib.yml

@@ -8,7 +8,7 @@
 # Bifrost. Setting it to true disables Bifrost image build and allows images to
 # be built with the `kayobe overcloud host image build` command. Default value
 # is {{ os_distribution == 'rocky' }}. This will change in a future release.
-#overcloud_dib_build_host_images:
+overcloud_dib_build_host_images: "{{ os_distribution == 'rocky' and not stackhpc_download_overcloud_host_images | bool }}"
 
 # List of additional host packages to install.
 overcloud_dib_host_packages_extra:

etc/kayobe/pulp-host-image-versions.yml

@@ -0,0 +1,8 @@
+---
+# Overcloud host image versioning tags
+# These images must be in SMS, since they are used by our AIO CI runners
+stackhpc_centos_8_stream_overcloud_host_image_version: "yoga-20230525T095243"
+stackhpc_rocky_8_overcloud_host_image_version: "yoga-20230629T135322"
+stackhpc_rocky_9_overcloud_host_image_version: "yoga-20230515T145140"
+stackhpc_ubuntu_focal_overcloud_host_image_version: "yoga-20230609T120720"
+stackhpc_ubuntu_jammy_overcloud_host_image_version: "yoga-20230609T120720"

etc/kayobe/pulp.yml

@@ -32,14 +32,14 @@ pulp_proxy_url: "{{ omit }}"
 ###############################################################################
 # StackHPC Pulp server
 
-# The scheme - http/https of the StackHPC Pulp service.
-stackhpc_release_pulp_scheme: "https://"
+# The scheme of the StackHPC Pulp service (http or https)
+stackhpc_release_pulp_scheme: "https"
 
 # The domain of the StackHPC Pulp service.
 stackhpc_release_pulp_domain: "ark.stackhpc.com"
 
 # Base URL of the StackHPC Pulp service.
-stackhpc_release_pulp_url: "{{ stackhpc_release_pulp_scheme }}{{ stackhpc_release_pulp_domain }}"
+stackhpc_release_pulp_url: "{{ stackhpc_release_pulp_scheme }}://{{ stackhpc_release_pulp_domain }}"
 
 # Credentials used to access the StackHPC Pulp service.
 stackhpc_release_pulp_username:
@@ -51,7 +51,7 @@ stackhpc_release_pulp_content_url: "{{ stackhpc_release_pulp_url }}/pulp/content
 # Content URL of the StackHPC Pulp service, with basic auth.
 # NOTE(Alex-Welsh): This may need reworking if it reveals the credentials
 # at runtime in the ansible output
-stackhpc_release_pulp_content_url_with_auth: "{{ stackhpc_release_pulp_scheme }}{{ stackhpc_release_pulp_username }}:{{ stackhpc_release_pulp_password }}@{{ stackhpc_release_pulp_domain }}/pulp/content"
+stackhpc_release_pulp_content_url_with_auth: "{{ stackhpc_release_pulp_scheme }}://{{ stackhpc_release_pulp_username }}:{{ stackhpc_release_pulp_password }}@{{ stackhpc_release_pulp_domain }}/pulp/content"
 
 # Sync all repositories required for building Kolla images from the
 # StackHPC Ark Pulp service to local Pulp.

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

@@ -19,14 +19,6 @@ stackhpc_overcloud_host_image_url: "{{ stackhpc_release_pulp_content_url_with_au
                                     overcloud-{{ os_distribution }}-{{ os_release }}\
                                     {{ '-ofed' if stackhpc_overcloud_host_image_is_ofed else '' }}.qcow2"
 
-# Overcloud host image versioning tags
-# These images must be in SMS, since they are used by our AIO CI runners
-stackhpc_centos_8_stream_overcloud_host_image_version: "yoga-20230525T095243"
-stackhpc_rocky_8_overcloud_host_image_version: "yoga-20230629T135322"
-stackhpc_rocky_9_overcloud_host_image_version: "yoga-20230515T145140"
-stackhpc_ubuntu_focal_overcloud_host_image_version: "yoga-20230609T120720"
-stackhpc_ubuntu_jammy_overcloud_host_image_version: "yoga-20230609T120720"
-
 # Overcloud host image version tag selection
 stackhpc_overcloud_host_image_version: >-
   {{ stackhpc_centos_8_stream_overcloud_host_image_version if os_distribution == 'centos' and os_release == '8-stream' else

releasenotes/notes/pull-stackhpc-host-images-a623e4ab2d2a9e5b.yaml

@@ -1,6 +1,6 @@
 ---
 features:
   - |
-    Prebuild overcloud host images can now be pulled from Ark using the
+    Prebuilt overcloud host images can now be pulled from Ark using the
     `stackhpc_download_overcloud_host_images` variable. The image is selected
     based on `os_distribution` and `os_release`.