Separate architecture from properties.cpu_arch

Allow both to be independent, but retain the original
behaviour of setting cpu_arch: "x86_64" when no
architecture is provided.

Author: m-bull

roles/os_images/defaults/main.yml

@@ -45,8 +45,7 @@ os_images_common: cloud-init enable-serial-console stable-interface-names
 #     type: qcow2
 os_images_list: []
 # Common properties to apply to all glance images.
-os_images_common_properties:
-  cpu_arch: x86_64
+os_images_common_properties: {}
 
 # OpenStack authentication type: passed to the os_image Ansible module
 os_images_auth_type: password

roles/os_images/tasks/images.yml

@@ -85,7 +85,7 @@
     dib_args: >-
       {% if item.size is defined %}--image-size {{ item.size }}{% endif %} {% if item.type is defined %}-t {{ item.type }}{% endif %}
       {% if item.packages | default %}-p {{ item.packages | join(',') }}{% endif %} {{ os_images_common }} {{ item.elements | join(' ') }}
-      -o {{ item.name }} {% if item.properties.cpu_arch is defined %}-a {{ item.properties.cpu_arch }}{% endif %}
+      -o {{ item.name }} {% if item.architecture is defined %}-a {{ item.architecture }}{% endif %}
   ansible.builtin.shell: . {{ os_images_dib_venv }}/bin/activate && disk-image-create {{ dib_args }} > {{ item.name }}.stdout 2> {{ item.name }}.stderr
   args:
     chdir: "{{ os_images_cache }}/{{ item.name }}"

roles/os_images/tasks/upload.yml

@@ -110,10 +110,19 @@
     container_format: bare
     disk_format: "{{ item.0.type | default('qcow2') }}"
     filename: "{{ os_images_cache }}/{{ item.0.name }}/{{ item.0.name }}.{{ item.0.type | default('qcow2') }}"
-    properties: "{{ os_images_common_properties | combine(item.0.properties | default({})) or omit }}"
+    properties: "{{ os_images_common_properties | combine(cpu_arch_properties) | combine(item.0.properties | default({})) or omit }}"
     kernel: "{{ item.1.id if is_baremetal else omit }}"
     ramdisk: "{{ item.2.id if is_baremetal else omit }}"
   vars:
+    # NOTE(m-anson): When architecture isn't defined for an
+    # image, assume that we should set cpu_arch: x86_64 as
+    # this is the diskimage-builder default.
+    cpu_arch_properties: >-
+      {{
+          {}
+          if item.0.architecture is defined
+          else {"cpu_arch": "x86_64"}
+      }}
     is_baremetal: "{{ item.0.elements is defined and 'baremetal' in item.0.elements }}"
     visibility: "{{ item.0.visibility | default(item.0.is_public | ternary('public', 'private') if item.0.is_public is defined else os_images_visibility) }}"
   with_together: