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-base | |
| 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-base')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 55 |
1 files changed, 12 insertions, 43 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 7ba84f479..7cf5cd50c 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -18,25 +18,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% if base_arch == 'x86_64' %} - {% if base_distro_tag.startswith('7') %} - {% set nova_base_packages = nova_base_packages + [ - 'OVMF' - ] %} - {% else %} - {% set nova_base_packages = nova_base_packages + [ - 'edk2-ovmf' - ] %} - {% endif %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-ovmf' + ] %} {% elif base_arch == 'aarch64' %} - {% if base_distro_tag.startswith('7') %} - {% set nova_base_packages = nova_base_packages + [ - 'AAVMF' - ] %} - {% else %} - {% set nova_base_packages = nova_base_packages + [ - 'edk2-aarch64' - ] %} - {% endif %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-aarch64' + ] %} {% elif base_arch == 'ppc64le' %} {# NOTE(Jeffrey4l): no packages for ppc64le #} {% endif %} @@ -71,25 +59,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch' ] %} {% if base_arch == 'x86_64' %} - {% if base_distro_tag.startswith('7') %} - {% set nova_base_packages = nova_base_packages + [ - 'OVMF' - ] %} - {% else %} - {% set nova_base_packages = nova_base_packages + [ - 'edk2-ovmf' - ] %} - {% endif %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-ovmf' + ] %} {% elif base_arch == 'aarch64' %} - {% if base_distro_tag.startswith('7') %} - {% set nova_base_packages = nova_base_packages + [ - 'AAVMF' - ] %} - {% else %} - {% set nova_base_packages = nova_base_packages + [ - 'edk2-aarch64' - ] %} - {% endif %} + {% set nova_base_packages = nova_base_packages + [ + 'edk2-aarch64' + ] %} {% elif base_arch == 'ppc64le' %} {# NOTE(Jeffrey4l): no packages for ppc64le #} {% endif %} @@ -149,13 +125,6 @@ RUN chmod 750 /etc/sudoers.d \ {% endif %} -{% if base_package_type == 'rpm' %} - {% if base_arch == 'x86_64' and base_distro_tag.startswith('7') %} -# NOTE(jeffrey4l): for x86_64, nova will validate the existence of /usr/share/OVMF/OVMF_CODE.fd -RUN ln -sf /usr/share/OVMF/OVMF_CODE.secboot.fd /usr/share/OVMF/OVMF_CODE.fd - {% endif %} -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_nova_extend_start \ |