diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-12-30 14:50:46 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-03-20 12:34:16 +0000 |
| commit | 7a0c639da31a913edb52e877fc950a928994441c (patch) | |
| tree | 65448ffc6e979e1d0c45242e9601716e654b8587 /docker | |
| parent | 830a10922565c9e482d799e7feca47ffe16624b0 (diff) | |
| download | kolla-7a0c639da31a913edb52e877fc950a928994441c.tar.gz kolla-7a0c639da31a913edb52e877fc950a928994441c.zip | |
nova/aarch64: Fix qemu-efi build failures
It probably has been omitted in Ubuntu 24.04 introduction since
aarch64 build jobs have not been stable.
Removing from nova-compute since it's already in nova-base,
nova-libvirt's parent is base - so updating to qemu-efi-aarch64
Change-Id: Idae2e87bfc8a556a090085e46f96d11279080f0f
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 8768c446d..702747976 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/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 %} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 4a50e8a83..1378b21e6 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/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) }} |