Merge pull request #405 from stackhpc/upstream/2024.1-2025-04-28

Synchronise 2024.1 with upstream

Author: Alex-Welsh

docker/nova/nova-base/Dockerfile.j2

@@ -44,7 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         ] %}
     {% elif base_arch == 'aarch64' %}
         {% set nova_base_packages = nova_base_packages + [
-            'qemu-efi',
+            'qemu-efi-aarch64',
         ] %}
     {% endif %}
 

docker/nova/nova-compute/Dockerfile.j2

@@ -79,12 +79,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'xfsprogs'
     ] %}
 
-    {% if base_arch == "aarch64" %}
-        {% set nova_compute_packages = nova_compute_packages + [
-            'qemu-efi'
-        ] %}
-    {% endif %}
-
 RUN mkdir -p /etc/ceph \
     && {{ macros.install_packages(nova_compute_packages | customizable("packages"), chain=True) }}