From 53443c5c712f4ec23b859105e94bcd90abc27762 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 9 Mar 2020 17:44:54 +0100 Subject: Remove support for CentOS 7 With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9 --- docker/openvswitch/openvswitch-base/Dockerfile.j2 | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'docker/openvswitch') diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index c98676f2c..e35544df1 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -12,20 +12,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set openvswitch_base_packages = [ 'openvswitch', - 'tcpdump' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set openvswitch_base_packages = openvswitch_base_packages + [ 'python3-netifaces', - 'python3-openvswitch' - ] %} - {% else %} - {% set openvswitch_base_packages = openvswitch_base_packages + [ - 'python-netifaces', - 'python-openvswitch' + 'python3-openvswitch', + 'tcpdump' ] %} - {% endif %} {% elif base_package_type == 'deb' %} {% set openvswitch_base_packages = [ 'openvswitch-switch', -- cgit v1.2.3