From 39c209c4896da6903e22245ef0f7b8087302ffe2 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 7 Dec 2021 16:02:03 +0100
Subject: [PATCH] Ensure nvme-cli is present in nova-compute images

The nvme-cli package is required to get the nvme command executed by
os-brick, which is used by nova-compute.

We don't need to explicitely install it for centos binary images, as it
is required by os-brick which is required by openstack-nova-common, but
all other types of images were missing it.

Change-Id: I754939da7636c57d2a8d5b83debb5d8a58e38432
Closes-Bug: #1953509
(cherry picked from commit 30eddf72f6d5380bb6078481581e47b0eec84982)
---
 docker/nova/nova-compute-ironic/Dockerfile.j2          | 3 +--
 docker/nova/nova-compute/Dockerfile.j2                 | 6 ++++--
 releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml

diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2
index b978e23996..1c5d7be37a 100644
--- a/docker/nova/nova-compute-ironic/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 4b412b991e..44c0d3c584 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/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',
@@ -52,8 +51,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',
             'python3-cephfs',
             'python3-guestfs',
@@ -95,6 +95,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'libosinfo',
             'ndctl',
             'nfs-utils',
+            'nvme-cli',
             'openvswitch',
             'parted',
             'python3-libguestfs',
@@ -123,6 +124,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'libosinfo-bin',
             'multipath-tools',
             'nfs-common',
+            'nvme-cli',
             'open-iscsi',
             'parted',
             'python3-cephfs',
diff --git a/releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml b/releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml
new file mode 100644
index 0000000000..c5cfa373c8
--- /dev/null
+++ b/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``.