diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-07 08:29:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-07 08:29:09 +0000 |
| commit | 17ce7d4de63273a0beca972b5f3cea1a0b62c928 (patch) | |
| tree | 891c4ca26e98910e327ab2183a7ce188d0fcf342 /docker/nova | |
| parent | 03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (diff) | |
| parent | aa59f0db6f88ed0a03169b473fdf6d541d34df9f (diff) | |
| download | kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.tar.gz kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.zip | |
Merge "Debian/Ubuntu: more python3 packages for binary"
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 d000fae70..848782004 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 e4f3aa5c3..ffc321318 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 9c54d84d9..fb75e443a 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-system', 'trousers' |