diff options
| author | Piotr Kopec <pkopec@redhat.com> | 2020-04-07 14:17:56 +0200 |
|---|---|---|
| committer | Piotr Kopec <pkopec@redhat.com> | 2020-04-14 15:46:12 +0200 |
| commit | f9ea23d940ec4ce35d503ac62f202daaa9db502d (patch) | |
| tree | 7dd90e5b9a7415874e12ed156160e6b130cd3feb /docker | |
| parent | 1b0884af8a4dc90b459c2557acdf987ad0a7df75 (diff) | |
| download | kolla-f9ea23d940ec4ce35d503ac62f202daaa9db502d.tar.gz kolla-f9ea23d940ec4ce35d503ac62f202daaa9db502d.zip | |
nova-compute: add ndctl to expose NVDIMMs to guests
`ndctl` is a utility for managing the nvdimm subsystem required
by Nova for attaching PMEM(persistent memory) namespaces to guests [0].
[0]: https://docs.openstack.org/nova/latest/admin/virtual-persistent-memory.html
Change-Id: I8ed1b6c1d0985b2a73206bd9249a5664cd80c912
Closes-Bug: #1870455
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 36083fe4e..71d68ef8b 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -21,6 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'e2fsprogs', 'genisoimage', 'iscsi-initiator-utils', + 'ndctl', 'nfs-utils', 'nvme-cli', 'openstack-nova-compute', @@ -72,6 +73,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")) }} @@ -89,6 +98,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'genisoimage', 'iscsi-initiator-utils', 'libosinfo', + 'ndctl', 'nfs-utils', 'openvswitch', 'parted', @@ -147,6 +157,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 |