aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder
diff options
context:
space:
mode:
Diffstat (limited to 'docker/cinder')
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j25
-rw-r--r--docker/cinder/cinder-volume/Dockerfile.j27
2 files changed, 6 insertions, 6 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index ba9d638f4..0e00c8ec7 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 88d7b9be7..c6f07ec29 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'
@@ -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")) }}