From 4a7af468b6c24322fd89b97933b1fee84e7b8d85 Mon Sep 17 00:00:00 2001 From: FelipeAFV Date: Mon, 25 Nov 2024 15:26:25 -0300 Subject: 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 Signed-off-by: Maksim Malchuk --- docker/cinder/cinder-base/Dockerfile.j2 | 4 +++- docker/cinder/cinder-volume/Dockerfile.j2 | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') 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', -- cgit v1.2.3