aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-03-08 18:50:14 +0100
committerMark Goddard <mark@stackhpc.com>2019-06-06 11:59:03 +0100
commitd436001b43f0a7e3c161ac4a2c5d09d36c6f1015 (patch)
tree84dc7758ef31ce9ef0871b73a489985ffee455ce /docker/nova
parent4926adb62465bf819fca2dacd42454d4e9eb74df (diff)
downloadkolla-d436001b43f0a7e3c161ac4a2c5d09d36c6f1015.tar.gz
kolla-d436001b43f0a7e3c161ac4a2c5d09d36c6f1015.zip
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
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-api/Dockerfile.j22
-rw-r--r--docker/nova/nova-base/Dockerfile.j22
-rw-r--r--docker/nova/nova-compute/Dockerfile.j29
3 files changed, 8 insertions, 5 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index 9024d9387..d000fae70 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/docker/nova/nova-api/Dockerfile.j2
@@ -58,7 +58,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set nova_api_packages = [
'apache2',
- 'libapache2-mod-wsgi'
+ 'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2
index 7516e5ce6..804f1644f 100644
--- a/docker/nova/nova-base/Dockerfile.j2
+++ b/docker/nova/nova-base/Dockerfile.j2
@@ -85,7 +85,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'iptables',
'openssh-client',
'openvswitch-switch',
- 'python-libvirt'
+ 'python3-libvirt'
] %}
{% if base_arch == 'x86_64' %}
{% set nova_base_packages = nova_base_packages + [
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 6ddc2e5b3..e4f3aa5c3 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -100,9 +100,12 @@ RUN rm -f /etc/nova/nova-compute.conf
'nfs-common',
'open-iscsi',
'parted',
- 'python-guestfs',
- 'python-libvirt',
- 'python-rtslib-fb',
+ 'python3-cephfs',
+ 'python3-guestfs',
+ 'python3-libvirt',
+ 'python3-rados',
+ 'python3-rbd',
+ 'python3-rtslib-fb',
'qemu-utils',
'targetcli-fb'
] %}