openstack
/
kolla
Code Issues Proposed changes

Merge "Exclude pcie_errors on s390x, it fails to build"

This commit is contained in:
Zuul 2020-04-09 20:34:10 +00:00 committed by Gerrit Code Review
parent 33bea9efeb 2c7835bf24
commit 7aa7e8ca34
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/collectd/Dockerfile.j2
View File

@ -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")) }}