diff options
| author | Matthias Runge <mrunge@redhat.com> | 2020-04-08 15:47:01 +0200 |
|---|---|---|
| committer | Matthias Runge <mrunge@redhat.com> | 2020-04-08 16:53:37 +0200 |
| commit | 2c7835bf244bab797977f82581a2b1363ef322fe (patch) | |
| tree | 9611e4f313cebfec6c294b2a9004226e845622c9 /docker | |
| parent | f1f1d854594da23321ad94ae6358ecbdc119d18e (diff) | |
| download | kolla-2c7835bf244bab797977f82581a2b1363ef322fe.tar.gz kolla-2c7835bf244bab797977f82581a2b1363ef322fe.zip | |
Exclude pcie_errors on s390x, it fails to build
The collectd pcie-errors plugin fails to build on s390 on
big endian, ppc64le is fine. For those building containers
on s390x, this patch removes a downstream patch.
Change-Id: I71008f690fcb04289451efa819b5e7f6d81cf99f
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index f35081574..d048f6ee5 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -39,7 +39,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'collectd-openldap', 'collectd-ovs-events', 'collectd-ovs-stats', - 'collectd-pcie-errors', 'collectd-ping', 'collectd-procevent', 'collectd-python', @@ -80,6 +79,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {% endif %} + {% if base_arch != 's390x' %} + {% set collectd_packages = collectd_packages + [ + 'collectd-pcie-errors' + ] %} + {% endif %} + {% endif %} {{ macros.install_packages(collectd_packages | customizable("packages")) }} |