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 f98cac2e1b..697a4df5e5 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', @@ -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', 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``.