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/kubetoolbox/Dockerfile.j2 | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docker/kubetoolbox') diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2 index 34f7695a9..87481d102 100644 --- a/docker/kubetoolbox/Dockerfile.j2 +++ b/docker/kubetoolbox/Dockerfile.j2 @@ -11,6 +11,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'jq' ] %} +{% if base_package_type == 'deb' %} + {% set kubetoolbox_packages = kubetoolbox_packages + [ + 'python3-cephfs', + 'python3-rados', + 'python3-rbd' + ] %} +{% endif %} + {{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }} {% block kubetoolbox_install_kube_binary %} -- cgit v1.2.3