diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-06-05 17:16:49 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-06-07 17:59:49 +0000 |
| commit | b71f2be433568e6c71ea1d54a92dfa6a449dead6 (patch) | |
| tree | f6df8519175dc8b1e4790b3da4c1095db3d20243 /docker/nova | |
| parent | c5d2e9683d8c26e382356a1c1b6d431e78e0f398 (diff) | |
| download | kolla-b71f2be433568e6c71ea1d54a92dfa6a449dead6.tar.gz kolla-b71f2be433568e6c71ea1d54a92dfa6a449dead6.zip | |
Debian/Ubuntu: more python3 packages for binary
backport: Stein
During the switch to Stein UCA, we did not switch all packages to python
3 for Debian/Ubuntu binary images. This change switches some more of
those packages.
Change-Id: I0bff21384d88ea678608392de2db1ba418c96665
Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
(cherry picked from commit aa59f0db6f88ed0a03169b473fdf6d541d34df9f)
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 11 | ||||
| -rw-r--r-- | docker/nova/nova-consoleauth/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-libvirt/Dockerfile.j2 | 3 |
4 files changed, 13 insertions, 7 deletions
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2 index 9024d9387..871ed50bc 100644 --- a/docker/nova/nova-api/Dockerfile.j2 +++ b/docker/nova/nova-api/Dockerfile.j2 @@ -27,9 +27,9 @@ 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', 'nova-api', - 'python-memcache' + 'python3-memcache' ] %} {{ macros.install_packages(nova_api_packages | customizable("packages")) }} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 6ddc2e5b3..8e76278c1 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -53,10 +53,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch-switch', 'open-iscsi', 'parted', - 'python-guestfs', - 'python-ironicclient', - 'python-oslo.vmware', - 'python-rtslib-fb', + 'python3-cephfs', + 'python3-guestfs', + 'python3-ironicclient', + 'python3-oslo.vmware', + 'python3-rados', + 'python3-rbd', + 'python3-rtslib-fb', 'sysfsutils', 'targetcli-fb' ] %} diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2 index 9e8613f6c..6974bde2a 100644 --- a/docker/nova/nova-consoleauth/Dockerfile.j2 +++ b/docker/nova/nova-consoleauth/Dockerfile.j2 @@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_consoleauth_packages = [ 'nova-consoleauth', - 'python-memcache' + 'python3-memcache' ] %} {% endif %} diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index b21f45c85..82aaf4b4f 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -40,6 +40,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libvirt-daemon-system', 'openvswitch-switch', 'pm-utils', + 'python3-cephfs', + 'python3-rados', + 'python3-rbd', 'qemu-block-extra', 'qemu-kvm', 'qemu-system', |