aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/cinder/cinder-base/Dockerfile.j24
-rw-r--r--docker/cinder/cinder-volume/Dockerfile.j22
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index d7ba7612a..f3cc00cc9 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -16,13 +16,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ceph-common',
'cryptsetup',
'lvm2',
+ 'nvme-cli',
'qemu-img'
] %}
{% elif base_package_type == 'deb' %}
{% set cinder_base_packages = [
'ceph-common',
- 'lvm2',
'cryptsetup',
+ 'lvm2',
+ 'nvme-cli',
'python3-cephfs',
'python3-rados',
'python3-rbd',
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 5b36b6503..e55b05e44 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
'lsscsi',
'device-mapper-multipath',
'nfs-utils',
- 'nvme-cli',
'nvmetcli',
'sysfsutils',
'targetcli'
@@ -22,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'lsscsi',
'multipath-tools',
'nfs-common',
- 'nvme-cli',
'sysfsutils',
'targetcli-fb',
'thin-provisioning-tools',