Skip to content

Commit 40a1c7a

Browse files
committed
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 (cherry picked from commit 6176d54)
1 parent 2b220c2 commit 40a1c7a

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

docker/base/apt_preferences.debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ Pin: version 1:5.0*
4848
Pin-Priority: 700
4949

5050
# QEMU depends on those
51-
Package: libpmem1 libndctl6 libdaxctl1
51+
Package: libpmem1 libndctl6 libdaxctl1 pmdk-tools libpmemblk1 libpmemlog1 libpmemobj1 libpmempool1
5252
Pin: release n=buster-backports
5353
Pin-Priority: 700

docker/nova/nova-compute/Dockerfile.j2

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1414

1515
{% set nova_compute_packages = [
1616
'ceph-common',
17+
'daxio',
1718
'device-mapper-multipath',
1819
'e2fsprogs',
1920
'genisoimage',
@@ -48,6 +49,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
4849
'openvswitch-switch',
4950
'open-iscsi',
5051
'parted',
52+
'pmdk-tools',
5153
'python3-cephfs',
5254
'python3-guestfs',
5355
'python3-ironicclient',
@@ -64,7 +66,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
6466
{% if base_distro == 'debian' or
6567
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
6668
{% set nova_compute_packages = nova_compute_packages + [
67-
'ndctl'
69+
'ndctl',
6870
] %}
6971
{% endif %}
7072

@@ -78,6 +80,7 @@ RUN rm -f /etc/nova/nova-compute.conf
7880

7981
{% set nova_compute_packages = [
8082
'ceph-common',
83+
'daxio',
8184
'device-mapper-multipath',
8285
'dosfstools',
8386
'e2fsprogs',
@@ -109,6 +112,7 @@ RUN rm -f /etc/nova/nova-compute.conf
109112
'nfs-common',
110113
'open-iscsi',
111114
'parted',
115+
'pmdk-tools',
112116
'python3-cephfs',
113117
'python3-guestfs',
114118
'python3-libvirt',
@@ -131,7 +135,7 @@ RUN rm -f /etc/nova/nova-compute.conf
131135
{% if base_distro == 'debian' or
132136
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
133137
{% set nova_compute_packages = nova_compute_packages + [
134-
'ndctl'
138+
'ndctl',
135139
] %}
136140
{% endif %}
137141

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
nova-compute uses daxio to cleanup vpmem backend device on instance
5+
delete. If the daxio binary is missing in the nova-compute container
6+
instance delete fails. daxio is provided in centos via daxio, in
7+
ubuntu via the pmdk-tools package.

0 commit comments

Comments
 (0)