aboutsummaryrefslogtreecommitdiff
path: root/docker/nova/nova-compute
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-12-08 18:44:23 +0000
committerGerrit Code Review <review@openstack.org>2021-12-08 18:44:23 +0000
commit8e8daa3565412a3f002558f71eee6dbe6fd4d4fb (patch)
tree9ca2c230dbf869705e681f4c6ee042512f231541 /docker/nova/nova-compute
parentde3ab6ebd43587e61bed27e78c1369f58cced5fc (diff)
parent30eddf72f6d5380bb6078481581e47b0eec84982 (diff)
downloadkolla-8e8daa3565412a3f002558f71eee6dbe6fd4d4fb.tar.gz
kolla-8e8daa3565412a3f002558f71eee6dbe6fd4d4fb.zip
Merge "Ensure nvme-cli is present in nova-compute images"
Diffstat (limited to 'docker/nova/nova-compute')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j26
1 files changed, 4 insertions, 2 deletions
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',