aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-07 08:29:06 +0000
committerGerrit Code Review <review@openstack.org>2019-06-07 08:29:06 +0000
commit03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (patch)
tree2b991061d4292373b31cb1c0a70479629c9fd9f3 /docker/cinder
parente9289eaa1ca59a59c6eda79197794f42fd2d4bfc (diff)
parentd436001b43f0a7e3c161ac4a2c5d09d36c6f1015 (diff)
downloadkolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.tar.gz
kolla-03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e.zip
Merge "Debian/Ubuntu: move to Python 3 for source images"
Diffstat (limited to 'docker/cinder')
-rw-r--r--docker/cinder/cinder-api/Dockerfile.j22
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j23
-rw-r--r--docker/cinder/cinder-volume/Dockerfile.j22
3 files changed, 5 insertions, 2 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index 442e02bde..84f3a1423 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -61,7 +61,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% elif base_package_type == 'deb' %}
{% set cinder_api_packages = [
'apache2',
- 'libapache2-mod-wsgi'
+ 'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index ba9d638f4..7d16272f1 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -59,6 +59,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ceph-common',
'lvm2',
'cryptsetup',
+ 'python3-cephfs',
+ 'python3-rados',
+ 'python3-rbd',
'qemu-utils'
] %}
{% endif %}
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 88d7b9be7..fb268e990 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -33,7 +33,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
{% set cinder_volume_packages = [
'nfs-common',
'sysfsutils',
- 'python-rtslib-fb',
+ 'python3-rtslib-fb',
'targetcli-fb',
'thin-provisioning-tools',
'tgt'