diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-18 18:11:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-18 18:11:30 +0000 |
| commit | 827dcbc7df6ea426c0cd1841589db57cd65a46d6 (patch) | |
| tree | 7adefc6544371a8bd7e7da372b37a99ccfbbdd7b /docker/nova/nova-base | |
| parent | 2241efb2eb61361c9291fd137250cb5e7719384d (diff) | |
| parent | fa8e174be6bc5b4d555258197938da9da40bfa81 (diff) | |
| download | kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.tar.gz kolla-827dcbc7df6ea426c0cd1841589db57cd65a46d6.zip | |
Merge "Remove support for OracleLinux"
Diffstat (limited to 'docker/nova/nova-base')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 79b826dc9..da379662c 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -16,13 +16,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% if base_arch == 'x86_64' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %} + {% if base_distro_tag.startswith('7') %} {% set nova_base_packages = nova_base_packages + [ 'OVMF' ] %} {% endif %} {% elif base_arch == 'aarch64' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %} + {% if base_distro_tag.startswith('7') %} {% set nova_base_packages = nova_base_packages + [ 'AAVMF' ] %} @@ -61,13 +61,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch' ] %} {% if base_arch == 'x86_64' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %} + {% if base_distro_tag.startswith('7') %} {% set nova_base_packages = nova_base_packages + [ 'OVMF' ] %} {% endif %} {% elif base_arch == 'aarch64' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %} + {% if base_distro_tag.startswith('7') %} {% set nova_base_packages = nova_base_packages + [ 'AAVMF' ] %} |