Merge "Ensure nvme-cli is present in nova-compute images"

docker/nova/nova-compute-ironic/Dockerfile.j2

@@ -7,13 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% set nova_compute_ironic_packages = ['genisoimage'] %}
+{% set nova_compute_ironic_packages = ['genisoimage', 'nvme-cli'] %}
 
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}
 
         {% set nova_compute_ironic_packages = nova_compute_ironic_packages + [
-            'nvme-cli',
             'openstack-nova-compute'
         ] %}
 {{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}

docker/nova/nova-compute/Dockerfile.j2

@@ -20,7 +20,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'iscsi-initiator-utils',
             'ndctl',
             'nfs-utils',
-            'nvme-cli',
             'openstack-nova-compute',
             'openvswitch',
             'parted',
@@ -54,8 +53,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'multipath-tools',
             'nfs-common',
             'nova-compute',
-            'openvswitch-switch',
+            'nvme-cli',
             'open-iscsi',
+            'openvswitch-switch',
             'parted',
             'pmdk-tools',
             'python3-cephfs',
@@ -96,6 +96,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'libosinfo',
             'ndctl',
             'nfs-utils',
+            'nvme-cli',
             'openvswitch',
             'parted',
             'python3-libguestfs',
@@ -128,6 +129,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'libosinfo-bin',
             'multipath-tools',
             'nfs-common',
+            'nvme-cli',
             'open-iscsi',
             'parted',
             'pmdk-tools',

releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Ensures the ``nvme-cli`` package is present in ``nova-compute`` images, as
+    it expected by ``os-brick``.