From 8df6eb01184672ffdc752437ea4d98d13f16026e Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Fri, 8 Mar 2019 13:19:03 +0100
Subject: replace 'distro_python3' variable with 'distro_python_version'

RHEL7 derived distros use Python 2.7
RHEL8 uses Python 3.6
Ubuntu 18.04 uses Python 3.6, but we haven't enabled it yet.
Debian:buster uses Python 3.7, but we haven't enabled it yet.

We have several places in code where "/lib/pythonX.Y/site-packages"
is used so we need to know value of X.Y rather than py2/py3 switch.

How to check for Python 2:

{% if distro_python_version == '2.7' %}

Breaks: Iad6b70b433a0dd1b0f8ae6790fd280594517661a
Change-Id: Ie24f109af19ae0438c21e0d43cb3cc947812b4ce
---
 docker/openstack-base/Dockerfile.j2 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'docker/openstack-base')

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index c3dab166a..4f6627197 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -211,11 +211,9 @@ ENV DEBIAN_FRONTEND noninteractive
         'debtcollector',
         'decorator',
         'elasticsearch',
-        'enum34',
         'eventlet',
         'fasteners',
         'funcsigs',
-        'functools32',
         'futures',
         'futurist',
         'gnocchiclient',
@@ -297,6 +295,14 @@ ENV DEBIAN_FRONTEND noninteractive
     ]
 %}
 
+{% if distro_python_version == '2.7' %}
+    {% set openstack_base_pip_packages = openstack_base_pip_packages + [
+             'enum34',
+             'functools32'
+         ]
+    %}
+{% endif %}
+
 ADD openstack-base-archive /openstack-base-source
 RUN ln -s openstack-base-source/* /requirements \
     && mkdir -p /var/lib/kolla \
-- 
cgit v1.2.3