diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-24 06:11:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-24 06:11:39 +0000 |
| commit | d5d1260a986e9490398c61244606c06e504075fc (patch) | |
| tree | b01e26fe03fe5c75db444bad4fbdc70206784355 | |
| parent | 501f0a65b2a09246f306151eeb337121d230fea2 (diff) | |
| parent | 332a0a9601d3038538ef52189da97880a2ed8cfa (diff) | |
| download | kolla-d5d1260a986e9490398c61244606c06e504075fc.tar.gz kolla-d5d1260a986e9490398c61244606c06e504075fc.zip | |
Merge "Add nvme-cli to nova compute packages"
| -rw-r--r-- | docker/nova/nova-compute-ironic/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docker/nova/nova-compute-ironic/Dockerfile.j2 b/docker/nova/nova-compute-ironic/Dockerfile.j2 index f798f69ee..bc387d039 100644 --- a/docker/nova/nova-compute-ironic/Dockerfile.j2 +++ b/docker/nova/nova-compute-ironic/Dockerfile.j2 @@ -11,6 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% 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 bc84b4250..702d2cbbb 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -15,6 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'genisoimage', 'iscsi-initiator-utils', 'nfs-utils', + 'nvme-cli', 'openstack-nova-compute', 'openvswitch', 'parted', |