From 0ca49532692a19f4ada5feb99141afda27e16277 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 16 Apr 2020 15:49:59 +0200 Subject: [PATCH] nova-libvirt: fix after centos 7 removal damage Removal of CentOS 7 butchered Dockerfile.j2 so UEFI was not installed in Debian/Ubuntu images. Change-Id: I13be95df12ed30a366bd7d0e934704bd338781cf --- docker/nova/nova-libvirt/Dockerfile.j2 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 953a0e43dc..3b47de8b21 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -63,17 +63,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'qemu-system', 'trousers' ] %} -{% elif base_package_type == 'rpm' %} - - {% if base_arch == 'x86_64' and base_distro_tag.startswith('7') %} -# NOTE(jeffrey4l): for x86_64, nova will validate the existence of /usr/share/OVMF/OVMF_CODE.fd -RUN ln -sf /usr/share/OVMF/OVMF_CODE.secboot.fd /usr/share/OVMF/OVMF_CODE.fd - {% endif %} - {% if base_arch == "aarch64" %} {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'qemu-efi' + 'qemu-efi-aarch64' ] %} {% elif base_arch == "x86_64" %} {% set nova_libvirt_packages = nova_libvirt_packages + [