Merge pull request #232 from stackhpc/upstream/xena-2023-06-26

Synchronise xena 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',

kolla/image/build.py

@@ -91,6 +91,7 @@ class Status(Enum):
         "blazar-base",
         "cyborg-base",
         "freezer-base",
+        "gnocchi-base",  # https://github.com/gnocchixyz/gnocchi/issues/1304
         "kuryr-base",
         "monasca-base",
         "monasca-thresh",
@@ -99,6 +100,10 @@ class Status(Enum):
         "zun-base",
     },
 
+    'source': {
+        "gnocchi-base",  # https://github.com/gnocchixyz/gnocchi/issues/1304
+    },
+
     'centos': {
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package