From d436001b43f0a7e3c161ac4a2c5d09d36c6f1015 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Fri, 8 Mar 2019 18:50:14 +0100
Subject: Debian/Ubuntu: move to Python 3 for source images

Commit 43b74ccc157c0b50138c3785ed91dab504895571 enabled use of Python 3
based packages but not switched to use Python 3.

Some of images still contain Python 2. There are two reasons:

- Ceph (ceph-common depends on Py2)
- python3-ldappool on Ubuntu 18.04

In Ceph situation Py3 packages were added. For second one we can not do
anything - Py2 dependency got dropped in Ubuntu 18.10 version.

Removed neutron-server-plugin-networking-infoblox due to being not
maintained. Once https://review.opendev.org/#/c/657578/ get merged
someone may revert that part.

Implements: blueprint debian-ubuntu-python3

Depends-on: Ie2a1077f7def0743f1403341985e2109aa490026

Change-Id: Ibfe0c2b8be98db56c61f74fb0247488ab3749ef4
---
 docker/base/Dockerfile.j2 | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 38372f72d..b61a6a989 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -317,7 +317,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
    'netbase',
    'open-iscsi',
    'procps',
-   'python',
+   'python3',
    'socat',
    'sudo',
    'tgt']
@@ -390,17 +390,19 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 {% endblock %}
 
-{% if base_distro == 'ubuntu' %}
-RUN sed -i \
-        -e "s|\('purelib': '\$base/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \
-        -e "s|\('platlib': '\$platbase/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \
-        -e "s|\('headers': '\$base/\)local/\(include/python\$py_version_short/\$dist_name',\)|\1\2|" \
-        -e "s|\('scripts': '\$base/\)local/\(bin',\)|\1\2|" \
-        -e "s|\('data'   : '\$base\)/local\(',\)|\1\2|" \
-        /usr/lib/python2.7/distutils/command/install.py \
-    && rm -rf /usr/lib/python2.7/site-packages \
-    && ln -s dist-packages /usr/lib/python2.7/site-packages
-{% endif %}
+# FIXME(mgoddard): Some images, including Horizon, depend on Ubuntu having a
+# site-packages directory.
+#{% if base_distro == 'ubuntu' %}
+#RUN sed -i \
+#        -e "s|\('purelib': '\$base/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \
+#        -e "s|\('platlib': '\$platbase/\)local/\(lib/python\$py_version_short/dist-packages',\)|\1\2|" \
+#        -e "s|\('headers': '\$base/\)local/\(include/python\$py_version_short/\$dist_name',\)|\1\2|" \
+#        -e "s|\('scripts': '\$base/\)local/\(bin',\)|\1\2|" \
+#        -e "s|\('data'   : '\$base\)/local\(',\)|\1\2|" \
+#        /usr/lib/python{{ distro_python_version }}/distutils/command/install.py \
+#    && rm -rf /usr/lib/python{{ distro_python_version }}/site-packages \
+#    && ln -s dist-packages /usr/lib/{{ distro_python_version }}/site-packages
+#{% endif %}
 
 {# endif base_package_type deb #}
 {% endif %}
@@ -410,6 +412,10 @@ RUN sed -ri '/-session(\s+)optional(\s+)pam_systemd.so/d' /etc/pam.d/system-auth
 {% endif %}
 
 COPY set_configs.py /usr/local/bin/kolla_set_configs
+{% if distro_python_version.startswith('3') %}
+RUN sed -i -e "s+#\!/usr/bin/env python+#\!/usr/bin/env python3+g" /usr/local/bin/kolla_set_configs
+{% endif %}
+
 COPY start.sh /usr/local/bin/kolla_start
 COPY sudoers /etc/sudoers
 COPY curlrc /root/.curlrc
-- 
cgit v1.2.3