diff options
| author | Pierre Riteau <pierre@stackhpc.com> | 2021-12-07 16:02:03 +0100 |
|---|---|---|
| committer | Pierre Riteau <pierre@stackhpc.com> | 2021-12-07 16:02:03 +0100 |
| commit | 30eddf72f6d5380bb6078481581e47b0eec84982 (patch) | |
| tree | 6ab29ad80d1e0f030a9d110b323463a2c1e686a8 /docker | |
| parent | f44d6ce85a56d2f77896f32901ebc73113fcc51f (diff) | |
| download | kolla-30eddf72f6d5380bb6078481581e47b0eec84982.tar.gz kolla-30eddf72f6d5380bb6078481581e47b0eec84982.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-compute-ironic/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index b978e2399..1c5d7be37 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 730e56f68..8c0df7fd4 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', |