diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-15 15:30:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-15 15:30:52 +0000 |
| commit | b53ddab4b6785b5c440b930554eb53143bfe7418 (patch) | |
| tree | 08960427b9c66c3e5166e86b3d27d3719b7bba2e /docker/nova/nova-compute | |
| parent | 665b2b5ca398df2b5e6c4cded72fcdf4ed3d240b (diff) | |
| parent | f9ea23d940ec4ce35d503ac62f202daaa9db502d (diff) | |
| download | kolla-b53ddab4b6785b5c440b930554eb53143bfe7418.tar.gz kolla-b53ddab4b6785b5c440b930554eb53143bfe7418.zip | |
Merge "nova-compute: add ndctl to expose NVDIMMs to guests"
Diffstat (limited to 'docker/nova/nova-compute')
| -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 248695fdf..9ea846b29 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -18,6 +18,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'e2fsprogs', 'genisoimage', 'iscsi-initiator-utils', + 'ndctl', 'nfs-utils', 'nvme-cli', 'openstack-nova-compute', @@ -58,6 +59,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")) }} @@ -75,6 +84,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'genisoimage', 'iscsi-initiator-utils', 'libosinfo', + 'ndctl', 'nfs-utils', 'openvswitch', 'parted', @@ -115,6 +125,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 |