aboutsummaryrefslogtreecommitdiff
path: root/docker/cinder
diff options
context:
space:
mode:
authorFelipeAFV <ffigueroa@whitestack.com>2024-11-25 15:26:25 -0300
committerMaksim Malchuk <maksim.malchuk@gmail.com>2025-01-13 16:10:24 +0300
commit4a7af468b6c24322fd89b97933b1fee84e7b8d85 (patch)
tree61f6e586319dddc06872279ec421638c7a1308de /docker/cinder
parentdca8462bc491a93c6a6ae71e86d59a2dcb804ff5 (diff)
downloadkolla-4a7af468b6c24322fd89b97933b1fee84e7b8d85.tar.gz
kolla-4a7af468b6c24322fd89b97933b1fee84e7b8d85.zip
Adds missing nvme package in cinder-backup
The package moved to the cinder-base image since it already added to the cinder-volume in I84c7633765749a5e9ced983505ef290c32154ccc. Closes-Bug: #2089587 Change-Id: I06e61ab388d9ecfa78e5d1fe1ae9cb8602d1cd36 Signed-off-by: FelipeAFV <ffigueroa@whitestack.com> Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
Diffstat (limited to 'docker/cinder')
-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',