Browse Source

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

tags/10.0.0.0rc1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
7aa7e8ca34
1 changed files with 6 additions and 1 deletions
  1. +6
    -1
      docker/collectd/Dockerfile.j2

+ 6
- 1
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")) }}


Loading…
Cancel
Save