Add ability to choose image build platform

Author: MaxBed4d

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

@@ -18,6 +18,13 @@ on:
         options:
           - SMS Lab
           - Leafcloud
+      cpu-platform-architecture:
+        description: Select the image's build architecture
+        type: choice
+        default: x86
+        options:
+          - x86
+          - aarch64
     secrets:
       KAYOBE_VAULT_PASSWORD:
         required: true
@@ -32,6 +39,7 @@ env:
   ANSIBLE_FORCE_COLOR: True
   KAYOBE_ENVIRONMENT: ci-builder
   KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+  overcloud_dib_architechture: ${{ inputs.cpu-platform-architecture == 'x86' && 'amd64' || 'arm64' }}
 jobs:
   runner-selection:
     uses: ./.github/workflows/runner-selector.yml
@@ -256,7 +264,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" \
+          -e artifact_type="kayobe-images/{{ inputs.cpu-platform-architecture }}" \
           -e file_regex="*.qcow2" \
           -e os_distribution="rocky" \
           -e os_release="9"
@@ -272,6 +280,7 @@ jobs:
           src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
           -e local_image_path="/opt/kayobe/images/overcloud-rocky-9/overcloud-rocky-9.qcow2" \
           -e image_name=overcloud-rocky-9-${{ steps.host_image_tag.outputs.host_image_tag }}
+          -e cpu-platform=${{ env.overcloud_dib_architechture }}
         env:
           CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
@@ -324,7 +333,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" \
+          -e artifact_type="kayobe-images/{{ inputs.cpu-platform-architecture }}" \
           -e file_regex="*.qcow2" \
           -e os_distribution="ubuntu" \
           -e os_release="jammy"
@@ -340,6 +349,7 @@ jobs:
           src/kayobe-config/etc/kayobe/ansible/openstack-host-image-upload.yml \
           -e local_image_path="/opt/kayobe/images/overcloud-ubuntu-jammy/overcloud-ubuntu-jammy.qcow2" \
           -e image_name=overcloud-ubuntu-jammy-${{ steps.host_image_tag.outputs.host_image_tag }}
+          -e cpu-platform=${{ env.overcloud_dib_architechture }}
         env:
           CLOUDS_YAML: ${{ secrets.CLOUDS_YAML }}
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}

etc/kayobe/ansible/openstack-host-image-upload.yml

@@ -6,7 +6,7 @@
   hosts: seed
   vars:
     local_image_path: /opt/kayobe/images/overcloud-{{ os_distribution }}-{{ os_release }}/overcloud-{{ os_distribution }}-{{ os_release }}.qcow2
-    image_name: overcloud-{{ os_distribution }}-{{ os_release }}
+    image_name: overcloud-{{ os_distribution }}-{{ os_release }}-{{ cpu-platform }}
   tasks:
     - name: Upload image to Glance
       block:

etc/kayobe/environments/ci-builder/overcloud-dib.yml

@@ -18,5 +18,3 @@ overcloud_dib_build_host_images: true
 # "packages": "{{ overcloud_dib_packages }}"}.
 overcloud_dib_host_images:
   - "{{ stackhpc_overcloud_dib_host_image }}"
-
-overcloud_dib_architecture: "arm64"

etc/kayobe/kolla.yml

@@ -426,6 +426,11 @@ kolla_build_customizations: "{{ kolla_build_customizations_common | combine(koll
 # Dict mapping Kolla Dockerfile ARG names to their values.
 kolla_build_args: {}
 
+###############################################################################
+# Kolla platform architecture configuration.
+
+kolla_base_arch: "{{ 'aarch64' if stackhpc_cpu_arch == 'arm64' else 'x86' }}"
+
 ###############################################################################
 # Kolla-ansible inventory configuration.
 

etc/kayobe/overcloud-dib.yml

@@ -67,11 +67,11 @@ overcloud_dib_host_packages_extra:
 overcloud_dib_git_elements_extra:
   - repo: "https://github.com/stackhpc/stackhpc-image-elements"
     local: "{{ source_checkout_path }}/stackhpc-image-elements"
-    version: "aarch64-image-build"
+    version: "v1.6.3"
     elements_path: "elements"
 
-
-overcloud_dib_architecture: "arm64"
+# Selects the architecture of the overcloud host image being built.
+overcloud_dib_architechture: "{{ 'amd64' if stackhpc_cpu_arch == 'x86' else 'arm64' }}" 
 
 # List of git repositories containing Diskimage Builder (DIB) elements. See
 # stackhpc.openstack.os_images role for usage. Default is a combination of

etc/kayobe/stackhpc.yml

@@ -27,6 +27,10 @@ stackhpc_include_os_minor_version_in_repo_url: false
 
 stackhpc_rocky_9_url_version: "{{ '9.' + stackhpc_pulp_repo_rocky_9_minor_version | string if stackhpc_include_os_minor_version_in_repo_url | bool else '9' }}"
 
+# Pick build architecture for kolla and disk image builder
+# Choose between x86 or arm64
+stackhpc_cpu_arch: 'x86'
+
 ###############################################################################
 # Debs
 # Ubuntu jammy

requirements.txt

@@ -1,3 +1,3 @@
-kayobe@git+https://github.com/stackhpc/kayobe@aarch64-image-build
+kayobe@git+https://github.com/stackhpc/kayobe@stackhpc/2024.1
 ansible-modules-hashivault>=5.2.1
 jmespath