From fa8e174be6bc5b4d555258197938da9da40bfa81 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 18 Sep 2019 12:40:59 +0100 Subject: Remove support for OracleLinux We have agreed to remove support for Oracle Linux. http://lists.openstack.org/pipermail/openstack-discuss/2019-June/006896.html Change-Id: I961dfba1aeef2c509ecdaf376dfe6928926ffb39 Depends-On: https://review.opendev.org/682858 --- docker/nova/nova-base/Dockerfile.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/nova/nova-base') 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' ] %} -- cgit v1.2.3