diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-18 23:21:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-18 23:21:53 +0000 |
| commit | 10e4503e7d2363a97068a74dbdf9d4ac4ec805f1 (patch) | |
| tree | a7a0da9ca24d85ceb5b530b4f251d47d6540bef4 /docker | |
| parent | c213921fddbfca13277d88ebaa35f8f34cd4809f (diff) | |
| parent | 5c075740425e92949f24901e45ff089c8b41d709 (diff) | |
| download | kolla-10e4503e7d2363a97068a74dbdf9d4ac4ec805f1.tar.gz kolla-10e4503e7d2363a97068a74dbdf9d4ac4ec805f1.zip | |
Merge "Add daxio for nvdimm scenario" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 19a1f8514..efdb75aad 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -39,6 +39,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% 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")) }} {% elif base_package_type == 'deb' %} @@ -55,6 +62,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch-switch', 'open-iscsi', 'parted', + 'pmdk-tools', 'python3-cephfs', 'python3-guestfs', 'python3-ironicclient', @@ -71,7 +79,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro == 'debian' or (base_distro == 'ubuntu' and base_arch == 'x86_64') %} {% set nova_compute_packages = nova_compute_packages + [ - 'ndctl' + 'ndctl', ] %} {% endif %} @@ -122,6 +130,13 @@ RUN rm -f /etc/nova/nova-compute.conf ] %} {% 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' %} {% set nova_compute_packages = [ @@ -134,6 +149,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'nfs-common', 'open-iscsi', 'parted', + 'pmdk-tools', 'python3-cephfs', 'python3-guestfs', 'python3-libvirt', @@ -156,7 +172,7 @@ RUN rm -f /etc/nova/nova-compute.conf {% if base_distro == 'debian' or (base_distro == 'ubuntu' and base_arch == 'x86_64') %} {% set nova_compute_packages = nova_compute_packages + [ - 'ndctl' + 'ndctl', ] %} {% endif %} |