From d436001b43f0a7e3c161ac4a2c5d09d36c6f1015 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz 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/openstack-base/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/openstack-base') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index edc07e73d..03c64fc7d 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -256,7 +256,7 @@ ENV DEBIAN_FRONTEND noninteractive 'libyaml-dev', 'libz-dev', 'pkg-config', - 'python-dev', + 'python3-dev', 'zip' ] %} @@ -295,7 +295,6 @@ ENV DEBIAN_FRONTEND noninteractive 'eventlet', 'fasteners', 'funcsigs', - 'futures', 'futurist', 'gnocchiclient', 'greenlet', @@ -379,7 +378,8 @@ ENV DEBIAN_FRONTEND noninteractive {% if distro_python_version == '2.7' %} {% set openstack_base_pip_packages = openstack_base_pip_packages + [ 'enum34', - 'functools32' + 'functools32', + 'futures' ] %} {% endif %} -- cgit v1.2.3