Browse Source

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 30eddf72f6)
changes/73/821173/2
Pierre Riteau 6 months ago committed by Michal Nasiadka
parent
commit
39c209c489
  1. 3
      docker/nova/nova-compute-ironic/Dockerfile.j2
  2. 6
      docker/nova/nova-compute/Dockerfile.j2
  3. 5
      releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml

3
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")) }}

6
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',

5
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``.
Loading…
Cancel
Save