Merge "nova-compute: add ndctl to expose NVDIMMs to guests" into stable/train

docker/nova/nova-compute/Dockerfile.j2

@@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'e2fsprogs',
             'genisoimage',
             'iscsi-initiator-utils',
+            'ndctl',
             'nfs-utils',
             'nvme-cli',
             'openstack-nova-compute',
@@ -65,6 +66,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'targetcli-fb',
             'xfsprogs'
         ] %}
+        # FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
+        # for other archs than 'x86_64
+        {% if base_distro == 'debian' or
+            (base_distro == 'ubuntu' and base_arch == 'x86_64') %}
+            {% set nova_compute_packages = nova_compute_packages + [
+                'ndctl'
+            ] %}
+        {% endif %}
 
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
 
@@ -82,6 +91,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'genisoimage',
             'iscsi-initiator-utils',
             'libosinfo',
+            'ndctl',
             'nfs-utils',
             'openvswitch',
             'parted',
@@ -140,6 +150,14 @@ RUN rm -f /etc/nova/nova-compute.conf
                 'qemu-efi'
             ] %}
         {% endif %}
+        # FIXME(pkopec): since Ubuntu 19.04 'ndctl' package is available
+        # for other archs than 'x86_64'
+        {% if base_distro == 'debian' or
+            (base_distro == 'ubuntu' and base_arch == 'x86_64') %}
+            {% set nova_compute_packages = nova_compute_packages + [
+                'ndctl'
+            ] %}
+        {% endif %}
 
 RUN mkdir -p /etc/ceph
 

releasenotes/notes/nova-compute-add-ndctl-811f923d81bbd6ac.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adding `ndctl` package to nova-compute to expose NVDIMM namespaces
+    to guests. The package is needed to manage PMEM namespaces.