summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-05-27 16:41:00 +0000
committerGerrit Code Review <review@openstack.org>2020-05-27 16:41:00 +0000
commit95f2b88a8aab6650cb1e12b491ed00692e6e7187 (patch)
tree6bc7c817498670b31e76a6b79424ddc5b4ee3d6a /docker
parentf6d8f6556939522b7f4cd26f62b0ac6c4e60b143 (diff)
parent7aa268615ad9ec23fab7cc358c0f548788311abe (diff)
downloadkolla-95f2b88a8aab6650cb1e12b491ed00692e6e7187.tar.gz
kolla-95f2b88a8aab6650cb1e12b491ed00692e6e7187.zip
Merge "nova-compute: add ndctl to expose NVDIMMs to guests" into stable/train
Diffstat (limited to 'docker')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j218
1 files changed, 18 insertions, 0 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index ba846e6be..90364f963 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/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