diff options
| author | Martin Schuppert <mschuppert@redhat.com> | 2020-12-07 18:16:07 +0100 |
|---|---|---|
| committer | Martin Schuppert <mschuppert@redhat.com> | 2020-12-15 14:22:12 +0100 |
| commit | 6176d54179109e85dee5ebc29a7726bcb05f76a9 (patch) | |
| tree | 1be2daef1890018f85217b4092f86ecde15756ae /docker/nova | |
| parent | 22c32a30e62d42c3631306775c0cd029eb659e9a (diff) | |
| download | kolla-6176d54179109e85dee5ebc29a7726bcb05f76a9.tar.gz kolla-6176d54179109e85dee5ebc29a7726bcb05f76a9.zip | |
Add daxio for nvdimm scenario
nova-compute uses daxio to cleanup vpmem backend device on instance
delete. If the daxio binary is missing in the nova-compute container
instance delete fails. daxio is provided in centos via daxio, in
ubuntu via the pmdk-tools package.
Change-Id: Ifb5948653565e2ae902783762e20e33527020efe
Closes-Bug: 1907124
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 2a8efb670..e3b76583a 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_compute_packages = [ 'ceph-common', + 'daxio', 'device-mapper-multipath', 'e2fsprogs', 'genisoimage', @@ -48,6 +49,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch-switch', 'open-iscsi', 'parted', + 'pmdk-tools', 'python3-cephfs', 'python3-guestfs', 'python3-ironicclient', @@ -64,7 +66,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro == 'debian' or (base_distro == 'ubuntu' and base_arch == 'x86_64') %} {% set nova_compute_packages = nova_compute_packages + [ - 'ndctl' + 'ndctl', ] %} {% endif %} @@ -78,6 +80,7 @@ RUN rm -f /etc/nova/nova-compute.conf {% set nova_compute_packages = [ 'ceph-common', + 'daxio', 'device-mapper-multipath', 'dosfstools', 'e2fsprogs', @@ -109,6 +112,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'nfs-common', 'open-iscsi', 'parted', + 'pmdk-tools', 'python3-cephfs', 'python3-guestfs', 'python3-libvirt', @@ -131,7 +135,7 @@ RUN rm -f /etc/nova/nova-compute.conf {% if base_distro == 'debian' or (base_distro == 'ubuntu' and base_arch == 'x86_64') %} {% set nova_compute_packages = nova_compute_packages + [ - 'ndctl' + 'ndctl', ] %} {% endif %} |