diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-02-04 17:57:41 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-02-05 09:32:15 +0000 |
| commit | c638e768a84b2544924293fb382fe326c16a0022 (patch) | |
| tree | 5165811cdb98093743fa796ab9b926f80c9bf1bc /docker | |
| parent | 2553c1845c7c4cf04d720b820e4bb13519eca4c9 (diff) | |
| download | kolla-c638e768a84b2544924293fb382fe326c16a0022.tar.gz kolla-c638e768a84b2544924293fb382fe326c16a0022.zip | |
nova-compute: 'ndctl' is available on all archs
In past 'ndctl' was x86-64 only in Ubuntu. This changed in 19.04 so time
to adapt.
Change-Id: I3e599f780e8f84ea131988f4a9a45f17055c8ab2
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 8c0df7fd4..a02732489 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -128,6 +128,7 @@ RUN rm -f /etc/nova/nova-compute.conf 'genisoimage', 'libosinfo-bin', 'multipath-tools', + 'ndctl', 'nfs-common', 'nvme-cli', 'open-iscsi', @@ -150,14 +151,6 @@ 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 \ && {{ macros.install_packages(nova_compute_packages | customizable("packages"), chain=True) }} |