Skip to content

Commit fc7dca8

Browse files
committed
Add hw_architecture property
1 parent a0b59f2 commit fc7dca8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ jobs:
243243
-e os_distribution="rocky" \
244244
-e os_release="9" \
245245
-e stackhpc_overcloud_dib_name=overcloud-rocky-9 \
246-
-e overcloud_dib_architecture=${{ env.overcloud_dib_architecture }}
246+
-e overcloud_dib_architecture=${{ inputs.cpu-platform-architecture == 'x86_64' && 'amd64' || 'aarch64' }}
247247
env:
248248
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
249249
if: inputs.rocky9
@@ -314,7 +314,7 @@ jobs:
314314
-e os_distribution="ubuntu" \
315315
-e os_release="noble" \
316316
-e stackhpc_overcloud_dib_name=overcloud-ubuntu-noble \
317-
-e overcloud_dib_architecture=${{ env.overcloud_dib_architecture }}
317+
-e overcloud_dib_architecture=${{ inputs.cpu-platform-architecture == 'x86_64' && 'amd64' || 'aarch64' }}
318318
env:
319319
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
320320
if: inputs.ubuntu-noble

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
disk_format: qcow2
4343
state: present
4444
filename: "{{ local_image_path }}"
45+
properties:
46+
hw_architecture: "{{ 'aarch64' if cpu_platform == 'arm64' else 'x86_64' }}"
4547

4648
always:
4749
- name: Remove clouds.yaml

0 commit comments

Comments
 (0)