Merge "Add daxio for nvdimm scenario" into stable/train
This commit is contained in:
commit
10e4503e7d
|
@ -39,6 +39,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
# NOTE(hrw): daxio is part of pmdk which is x86-64 only in CentOS 8
|
||||||
|
{% if base_arch == 'x86_64' %}
|
||||||
|
{% set nova_compute_packages = nova_compute_packages + [
|
||||||
|
'daxio'
|
||||||
|
] %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
|
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
@ -55,6 +62,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'openvswitch-switch',
|
'openvswitch-switch',
|
||||||
'open-iscsi',
|
'open-iscsi',
|
||||||
'parted',
|
'parted',
|
||||||
|
'pmdk-tools',
|
||||||
'python3-cephfs',
|
'python3-cephfs',
|
||||||
'python3-guestfs',
|
'python3-guestfs',
|
||||||
'python3-ironicclient',
|
'python3-ironicclient',
|
||||||
|
@ -71,7 +79,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% if base_distro == 'debian' or
|
{% if base_distro == 'debian' or
|
||||||
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
|
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
|
||||||
{% set nova_compute_packages = nova_compute_packages + [
|
{% set nova_compute_packages = nova_compute_packages + [
|
||||||
'ndctl'
|
'ndctl',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
@ -122,6 +130,13 @@ RUN rm -f /etc/nova/nova-compute.conf
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
# NOTE(hrw): daxio is part of pmdk which is x86-64 only in CentOS 8
|
||||||
|
{% if base_arch == 'x86_64' %}
|
||||||
|
{% set nova_compute_packages = nova_compute_packages + [
|
||||||
|
'daxio'
|
||||||
|
] %}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% elif base_package_type == 'deb' %}
|
{% elif base_package_type == 'deb' %}
|
||||||
|
|
||||||
{% set nova_compute_packages = [
|
{% set nova_compute_packages = [
|
||||||
|
@ -134,6 +149,7 @@ RUN rm -f /etc/nova/nova-compute.conf
|
||||||
'nfs-common',
|
'nfs-common',
|
||||||
'open-iscsi',
|
'open-iscsi',
|
||||||
'parted',
|
'parted',
|
||||||
|
'pmdk-tools',
|
||||||
'python3-cephfs',
|
'python3-cephfs',
|
||||||
'python3-guestfs',
|
'python3-guestfs',
|
||||||
'python3-libvirt',
|
'python3-libvirt',
|
||||||
|
@ -156,7 +172,7 @@ RUN rm -f /etc/nova/nova-compute.conf
|
||||||
{% if base_distro == 'debian' or
|
{% if base_distro == 'debian' or
|
||||||
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
|
(base_distro == 'ubuntu' and base_arch == 'x86_64') %}
|
||||||
{% set nova_compute_packages = nova_compute_packages + [
|
{% set nova_compute_packages = nova_compute_packages + [
|
||||||
'ndctl'
|
'ndctl',
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue