diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-02-04 17:06:28 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-02-04 17:06:28 +0100 |
| commit | fc89e57c1cad910dc9f2f01a2ec3c6c36051c8bc (patch) | |
| tree | 1b966644ad350146d06e9e468c51cbc800fcd491 /docker/nova/nova-libvirt/Dockerfile.j2 | |
| parent | 849b31303f4aad7d6fb190a80cf95514e8755279 (diff) | |
| download | kolla-fc89e57c1cad910dc9f2f01a2ec3c6c36051c8bc.tar.gz kolla-fc89e57c1cad910dc9f2f01a2ec3c6c36051c8bc.zip | |
get rid of traces of CentOS 7 support
Change-Id: I4d20f23a9b26364943bf967908255d82c8f6621b
Diffstat (limited to 'docker/nova/nova-libvirt/Dockerfile.j2')
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 794d903eb..5613d9d9c 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -26,25 +26,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'trousers' ] %} {% if base_arch == 'x86_64' %} - {% if base_distro_tag.startswith('7') %} - {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'OVMF' - ] %} - {% else %} - {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'edk2-ovmf' - ] %} - {% endif %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'edk2-ovmf' + ] %} {% elif base_arch == 'aarch64' %} - {% if base_distro_tag.startswith('7') %} - {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'AAVMF' - ] %} - {% else %} - {% set nova_libvirt_packages = nova_libvirt_packages + [ - 'edk2-aarch64' - ] %} - {% endif %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'edk2-aarch64' + ] %} {% endif %} {% elif base_package_type == 'deb' %} |