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/base/Dockerfile.j2 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 98e8ff132..5eeec4e09 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -227,15 +227,25 @@ RUN yum -y install \ {% block base_redhat_binary_versionlock %}{% endblock %} {% if install_type == 'binary' %} {% set base_centos_binary_packages = [ + 'findutils', 'iproute', 'iscsi-initiator-utils', 'lvm2', - 'python', 'scsi-target-utils', 'socat', 'sudo', 'which' ] %} +{% if distro_python_version.startswith('3') %} +{% set base_centos_binary_packages = base_centos_binary_packages + [ + 'python3' +] %} +{% else %} +{% set base_centos_binary_packages = base_centos_binary_packages + [ + 'python' +] %} +{% endif %} + # Install base packages {{ macros.install_packages( base_centos_binary_packages | customizable("centos_binary_packages")) }} {% endif %} -- cgit v1.2.3