From c638e768a84b2544924293fb382fe326c16a0022 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 4 Feb 2022 17:57:41 +0100 Subject: 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 --- docker/nova/nova-compute/Dockerfile.j2 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'docker') 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) }} -- cgit v1.2.3