From cbcd2efe71c5ab447fba9b0a5b4dd5f1b2c18b2e Mon Sep 17 00:00:00 2001 From: Lee Yarwood Date: Thu, 21 Feb 2019 11:52:21 +0000 Subject: [PATCH] nova: Only install OVMF on EL 7 when installing from source This use case was missed in Ic8f865ed9cfc89056991ce4fa50a99c4937af33b. Change-Id: Ibe4c459d60f1143c76657588ed9c0081bda92239 --- 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 0a638b3ef8..de9e6a20fb 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -65,13 +65,17 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch' ] %} {% 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 %}