diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-09 20:34:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-09 20:34:10 +0000 |
| commit | 7aa7e8ca344793bcd30b463c0d7644c255acd973 (patch) | |
| tree | cd0c96854e632d8500709e4944ccbd7180cb61ca | |
| parent | 33bea9efeb22986f8a092b3e7b5ea79b058604fc (diff) | |
| parent | 2c7835bf244bab797977f82581a2b1363ef322fe (diff) | |
| download | kolla-7aa7e8ca344793bcd30b463c0d7644c255acd973.tar.gz kolla-7aa7e8ca344793bcd30b463c0d7644c255acd973.zip | |
Merge "Exclude pcie_errors on s390x, it fails to build"
| -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")) }} |