aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder
diff options
context:
space:
mode:
Diffstat (limited to 'docker/cinder')
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j26
-rw-r--r--docker/cinder/cinder-volume/Dockerfile.j21
2 files changed, 3 insertions, 4 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index a20902f0f..8ed7e0d20 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -50,13 +50,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'lvm2',
'cryptsetup',
] %}
- {% if base_distro in ['centos'] %}
+ {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
{% set cinder_base_packages = cinder_base_packages + [
- 'qemu-img-ev'
+ 'qemu-img'
] %}
{% else %}
{% set cinder_base_packages = cinder_base_packages + [
- 'qemu-img'
+ 'qemu-img-ev'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 55bf62a77..a5f3af756 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -12,7 +12,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'sysfsutils',
'targetcli'
] %}
-
{% if distro_python_version.startswith('3') %}
{% set cinder_volume_packages = cinder_volume_packages + [
'python3-rtslib',