aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-07 08:29:09 +0000
committerGerrit Code Review <review@openstack.org>2019-06-07 08:29:09 +0000
commit17ce7d4de63273a0beca972b5f3cea1a0b62c928 (patch)
tree891c4ca26e98910e327ab2183a7ce188d0fcf342 /docker/cinder
parent03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (diff)
parentaa59f0db6f88ed0a03169b473fdf6d541d34df9f (diff)
downloadkolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.tar.gz
kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.zip
Merge "Debian/Ubuntu: more python3 packages for binary"
Diffstat (limited to 'docker/cinder')
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j25
-rw-r--r--docker/cinder/cinder-volume/Dockerfile.j25
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 7d16272f1..a9f1f7ef8 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -33,7 +33,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'cinder-common',
'lvm2',
'cryptsetup',
- 'python-oslo.vmware'
+ 'python3-cephfs',
+ 'python3-oslo.vmware',
+ 'python3-rados',
+ 'python3-rbd'
] %}
{% endif %}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index fb268e990..c6f07ec29 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -50,10 +50,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% if install_type == 'binary' %}
{% if base_package_type == 'deb' %}
{% set cinder_volume_packages = [
- 'cinder-volume',
- 'python-rtslib-fb',
- 'targetcli-fb',
- 'thin-provisioning-tools'
+ 'cinder-volume',
] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}