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
This commit is contained in:
Martin Schuppert 2020-12-07 18:16:07 +01:00
parent 22c32a30e6
commit 6176d54179
3 changed files with 14 additions and 3 deletions

View File

@ -48,6 +48,6 @@ Pin: version 1:5.0*
Pin-Priority: 700
# QEMU depends on those
Package: libpmem1 libndctl6 libdaxctl1
Package: libpmem1 libndctl6 libdaxctl1 pmdk-tools libpmemblk1 libpmemlog1 libpmemobj1 libpmempool1
Pin: release n=buster-backports
Pin-Priority: 700

View File

@ -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 %}

View File

@ -0,0 +1,7 @@
---
fixes:
- |
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.