diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-08 08:38:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-08 08:38:00 +0000 |
| commit | 5573e6e4f58c7f5ffd54e481a4af0e89ff88a03c (patch) | |
| tree | 06f3a286f6802e803f26e4338c57efe81ac745b8 /docker | |
| parent | c0be6b1265c53b1ca113e8c39b6cd6b1c829069e (diff) | |
| parent | c638e768a84b2544924293fb382fe326c16a0022 (diff) | |
| download | kolla-5573e6e4f58c7f5ffd54e481a4af0e89ff88a03c.tar.gz kolla-5573e6e4f58c7f5ffd54e481a4af0e89ff88a03c.zip | |
Merge "nova-compute: 'ndctl' is available on all archs"
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) }} |