From 7e05deafbf8eba823cbd44a4bc5831388a0c1b8d Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 14 Feb 2019 08:32:44 +0000 Subject: [PATCH] nova: Only install OVMF packages on RHEL 7 These packages have been provided as direct dependencies of QEMU in more recent versions of Fedora and will continue to be for RHEL 8 and it's derived distributions. https://src.fedoraproject.org/rpms/qemu/blob/f29/f/qemu.spec#_820 Change-Id: Ic8f865ed9cfc89056991ce4fa50a99c4937af33b --- docker/nova/nova-base/Dockerfile.j2 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 26f2cfdf6f..0a638b3ef8 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -19,13 +19,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% if base_arch == 'x86_64' %} - {% set nova_base_packages = nova_base_packages + [ - 'OVMF' - ] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %} + {% set nova_base_packages = nova_base_packages + [ + 'OVMF' + ] %} + {% endif %} {% elif base_arch == 'aarch64' %} - {% set nova_base_packages = nova_base_packages + [ - 'AAVMF' - ] %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %} + {% set nova_base_packages = nova_base_packages + [ + 'AAVMF' + ] %} + {% endif %} {% elif base_arch == 'ppc64le' %} {# NOTE(Jeffrey4l): no packages for ppc64le #} {% endif %}