diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-18 10:48:51 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-12-18 14:32:46 +0100 |
| commit | edb6b60a9864012e3427155e909788f5625d126d (patch) | |
| tree | 26937cd75ff160c79bcc2602fedd1cc165dd14ce /docker/nova | |
| parent | 1d36ae464830061473302e2ddc563e9c229aed5c (diff) | |
| download | kolla-edb6b60a9864012e3427155e909788f5625d126d.tar.gz kolla-edb6b60a9864012e3427155e909788f5625d126d.zip | |
nova-compute: daxio on CentOS 8 is x86-64 only
I somehow missed that when it was sent for review.
Change-Id: Iabacaeccdb360544125ad910d5c3f5f9d895dac5
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index e3b76583a..724fda871 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -14,7 +14,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_compute_packages = [ 'ceph-common', - 'daxio', 'device-mapper-multipath', 'e2fsprogs', 'genisoimage', @@ -33,6 +32,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'xfsprogs' ] %} + # 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' %} @@ -80,7 +86,6 @@ RUN rm -f /etc/nova/nova-compute.conf {% set nova_compute_packages = [ 'ceph-common', - 'daxio', 'device-mapper-multipath', 'dosfstools', 'e2fsprogs', @@ -100,6 +105,13 @@ RUN rm -f /etc/nova/nova-compute.conf 'xfsprogs' ] %} + # 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 = [ |