diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-08 18:44:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-08 18:44:23 +0000 |
| commit | 8e8daa3565412a3f002558f71eee6dbe6fd4d4fb (patch) | |
| tree | 9ca2c230dbf869705e681f4c6ee042512f231541 | |
| parent | de3ab6ebd43587e61bed27e78c1369f58cced5fc (diff) | |
| parent | 30eddf72f6d5380bb6078481581e47b0eec84982 (diff) | |
| download | kolla-8e8daa3565412a3f002558f71eee6dbe6fd4d4fb.tar.gz kolla-8e8daa3565412a3f002558f71eee6dbe6fd4d4fb.zip | |
Merge "Ensure nvme-cli is present in nova-compute images"
| -rw-r--r-- | docker/nova/nova-compute-ironic/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml | 5 |
3 files changed, 10 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', diff --git a/releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml b/releasenotes/notes/nova-nvme-cli-bf940ad0005cac80.yaml new file mode 100644 index 000000000..c5cfa373c --- /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``. |