diff options
| author | Zuul <zuul@review.openstack.org> | 2019-02-22 14:21:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-02-22 14:21:42 +0000 |
| commit | 96b8816a5d13994a1a5ea6ae8ab2074ca1cbfe1c (patch) | |
| tree | 339a80ce4a98be9fe77173cc83ec0da5467b5b90 | |
| parent | 33efd3ee1bd6ff75618adf8b108f0771183d446c (diff) | |
| parent | cbcd2efe71c5ab447fba9b0a5b4dd5f1b2c18b2e (diff) | |
| download | kolla-96b8816a5d13994a1a5ea6ae8ab2074ca1cbfe1c.tar.gz kolla-96b8816a5d13994a1a5ea6ae8ab2074ca1cbfe1c.zip | |
Merge "nova: Only install OVMF on EL 7 when installing from source"
| -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 %} |