diff options
| author | Lee Yarwood <lyarwood@redhat.com> | 2019-02-21 11:52:21 +0000 |
|---|---|---|
| committer | Lee Yarwood <lyarwood@redhat.com> | 2019-02-21 11:53:05 +0000 |
| commit | cbcd2efe71c5ab447fba9b0a5b4dd5f1b2c18b2e (patch) | |
| tree | d5e3d31a611a39b4c84e85d89d741f42db815d8d /docker | |
| parent | 34db656e57283fa800096746156d44f26c7d947e (diff) | |
| download | kolla-cbcd2efe71c5ab447fba9b0a5b4dd5f1b2c18b2e.tar.gz kolla-cbcd2efe71c5ab447fba9b0a5b4dd5f1b2c18b2e.zip | |
nova: Only install OVMF on EL 7 when installing from source
This use case was missed in Ic8f865ed9cfc89056991ce4fa50a99c4937af33b.
Change-Id: Ibe4c459d60f1143c76657588ed9c0081bda92239
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 0a638b3ef..de9e6a20f 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 %} |