diff options
| author | Zuul <zuul@review.openstack.org> | 2019-02-21 11:28:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-02-21 11:28:33 +0000 |
| commit | 34db656e57283fa800096746156d44f26c7d947e (patch) | |
| tree | c64234d412ea9a354c1f81717734f4ea73a8fc3f | |
| parent | efc32ec0f44ab946766ab83b602d4cad4b420236 (diff) | |
| parent | 7e05deafbf8eba823cbd44a4bc5831388a0c1b8d (diff) | |
| download | kolla-34db656e57283fa800096746156d44f26c7d947e.tar.gz kolla-34db656e57283fa800096746156d44f26c7d947e.zip | |
Merge "nova: Only install OVMF packages on RHEL 7"
| -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 26f2cfdf6..0a638b3ef 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 %} |