Make build arch definition flexible

Author: MaxBed4d

etc/kayobe/kolla.yml

@@ -62,6 +62,17 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
 ###############################################################################
 # Kolla configuration.
 
+
+# Kolla base container image architecture. Options are "x86_64", "aarch64".
+# Default is "{{ ansible_facts.architecture }}"
+# NOTE(bbezak): evaluating this var locally for non facts gathering playbooks
+kolla_base_arch: >-
+  {{
+    'aarch64' if (stackhpc_cpu_arch_override is defined and stackhpc_cpu_arch_override | length > 0 and stackhpc_cpu_arch_override == 'arm64')
+    else (stackhpc_cpu_arch_override if (stackhpc_cpu_arch_override is defined and stackhpc_cpu_arch_override | length > 0)
+    else ('aarch64' if lookup('pipe','uname -m') in ['aarch64','arm64'] else 'x86_64'))
+  }}
+
 # Kolla base container image distribution. Options are "centos", "debian",
 # "rocky", "ubuntu". Default is {{ os_distribution }}.
 #kolla_base_distro:
@@ -430,11 +441,6 @@ 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 stackhpc_cpu_arch }}"
-
 ###############################################################################
 # Kolla-ansible inventory configuration.
 

etc/kayobe/stackhpc.yml

@@ -28,8 +28,13 @@ 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_64 or arm64
-stackhpc_cpu_arch: 'x86_64'
+# Choose between x86_64 or arm64. Leaving unset will default
+# to the local architecture.
+stackhpc_cpu_arch_override: ""
+
+# If the override variable hasnt been set above then both kolla_base_arch and
+# stackhpc_cpu_arch will default to the local architecture.
+stackhpc_cpu_arch: "{{ 'arm64' if kolla_base_arch == 'aarch64' else kolla_base_arch }}"
 
 ###############################################################################
 # Debs