diff options
| author | Zuul <zuul@review.opendev.org> | 2025-02-11 11:38:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-02-11 11:38:46 +0000 |
| commit | d332efe2101b7806cff992d304ba5d5a4ec51c61 (patch) | |
| tree | db83d1869c9ed522127a4520b32a2df1f96c5c1e /docker | |
| parent | ed7c8399c4a2a43e9a4165db416b98f5be8d538c (diff) | |
| parent | 4a7af468b6c24322fd89b97933b1fee84e7b8d85 (diff) | |
| download | kolla-d332efe2101b7806cff992d304ba5d5a4ec51c61.tar.gz kolla-d332efe2101b7806cff992d304ba5d5a4ec51c61.zip | |
Merge "Adds missing nvme package in cinder-backup"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index 0f0b20894..312f12808 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', |