diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-07 08:29:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-07 08:29:06 +0000 |
| commit | 03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (patch) | |
| tree | 2b991061d4292373b31cb1c0a70479629c9fd9f3 /docker/nova | |
| parent | e9289eaa1ca59a59c6eda79197794f42fd2d4bfc (diff) | |
| parent | d436001b43f0a7e3c161ac4a2c5d09d36c6f1015 (diff) | |
| download | kolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.tar.gz kolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.zip | |
Merge "Debian/Ubuntu: move to Python 3 for source images"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 9 |
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' ] %} |