From 3e5d8e2653db1c6c28cb428f81cd0bc332c623c3 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 21 Jan 2019 12:58:19 -0700 Subject: Add python3 packages for RHEL systems RDO is currently working on python3 support for the next version of CentOS/RHEL based systems. This package uses the distro_python3 flag that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to use the python3 specific package names. This change only adds python3 package names for RHEL systems. Conflicts-With: https://review.openstack.org/#/c/636457/ Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Related-Blueprint: python3-support --- docker/openvswitch/openvswitch-base/Dockerfile.j2 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'docker/openvswitch') diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 1b0a7c66c..439eb12ac 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -10,11 +10,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set openvswitch_base_packages = [ 'openvswitch', - 'python-netifaces', - 'python-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' + ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set openvswitch_base_packages = [ 'openvswitch-switch', -- cgit v1.2.3