Merge pull request #233 from stackhpc/upstream/wallaby-2023-06-26

Synchronise wallaby with upstream

Author: markgoddard

docker/cinder/cinder-volume/Dockerfile.j2

@@ -9,8 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
     {% set cinder_volume_packages = [
+            'lsscsi',
             'device-mapper-multipath',
             'nfs-utils',
+            'nvme-cli',
             'nvmetcli',
             'python3-rtslib',
             'python3-cinderlib',