Adjust how images are consumed

Author: MaxBed4d

.github/workflows/overcloud-host-image-build.yml

@@ -44,6 +44,7 @@ env:
   KAYOBE_ENVIRONMENT: ci-builder
   KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
   overcloud_dib_architecture: ${{ inputs.cpu-platform-architecture == 'x86_64' && 'amd64' || 'arm64' }}
+  pulp_artifact_path: ${{ inputs.cpu-platform-architecture == 'x86_64' && 'kayobe-images' || 'kayobe-images/aarch64' }}
 jobs:
   runner-selection:
     uses: ./.github/workflows/runner-selector.yml
@@ -268,7 +269,7 @@ jobs:
           src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
           -e artifact_path=/opt/kayobe/images/overcloud-rocky-9 \
           -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
-          -e artifact_type=kayobe-images/${{ inputs.cpu-platform-architecture }} \
+          -e artifact_type=${{ env.pulp_artifact_path }} \
           -e file_regex="*.qcow2" \
           -e os_distribution="rocky" \
           -e os_release="9"
@@ -338,7 +339,7 @@ jobs:
           src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
           -e artifact_path=/opt/kayobe/images/overcloud-ubuntu-jammy \
           -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
-          -e artifact_type=kayobe-images/${{ inputs.cpu-platform-architecture }} \
+          -e artifact_type=${{ env.pulp_artifact_path }} \
           -e file_regex="*.qcow2" \
           -e os_distribution="ubuntu" \
           -e os_release="jammy"
@@ -408,7 +409,7 @@ jobs:
           src/kayobe-config/etc/kayobe/ansible/pulp-artifact-upload.yml \
           -e artifact_path=/opt/kayobe/images/overcloud-ubuntu-noble \
           -e artifact_tag=${{ steps.host_image_tag.outputs.host_image_tag }} \
-          -e artifact_type=kayobe-images/${{ inputs.cpu-platform-architecture }} \
+          -e artifact_type=${{ env.pulp_artifact_path }} \
           -e file_regex="*.qcow2" \
           -e os_distribution="ubuntu" \
           -e os_release="noble"

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

@@ -8,6 +8,7 @@ stackhpc_download_overcloud_host_images: false
 # The overcloud host image source, defined by os_distribution, os_release,
 # and the current stable version.
 stackhpc_overcloud_host_image_url: "{{ stackhpc_release_pulp_content_url_with_auth }}/kayobe-images/\
+                                    {{ 'aarch64/' if stackhpc_cpu_arch == 'arm64' else '' }}\
                                     {{ openstack_release }}/{{ os_distribution }}/{{ os_release }}/\
                                     {{ stackhpc_overcloud_host_image_version }}/\
                                     overcloud-{{ os_distribution }}-{{ os_release }}.qcow2"