diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-28 10:52:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-28 10:52:22 +0000 |
| commit | 44fb1219940bc2c1125eb5fe2b5183f7a2dd5f2d (patch) | |
| tree | 3825c75e67ded3e699e5457386fc0d806299819e /docker | |
| parent | eedeb3c783b2b3f28c2c857d9f8c13663cd7e6c9 (diff) | |
| parent | 3f8db42f1fdd1cb392a021bfa3850300cefc41df (diff) | |
| download | kolla-44fb1219940bc2c1125eb5fe2b5183f7a2dd5f2d.tar.gz kolla-44fb1219940bc2c1125eb5fe2b5183f7a2dd5f2d.zip | |
Merge "collectd: turbostat is x86 only, it fails on Arm64"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index 2960b89a4..1a4661d6a 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -29,7 +29,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'collectd-smart', 'collectd-snmp-agent', 'collectd-sysevent', - 'collectd-turbostat', 'collectd-utils', 'collectd-virt', 'collectd-write_prometheus', @@ -39,7 +38,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_arch =='x86_64' %} {% set collectd_packages = collectd_packages + [ 'collectd-hugepages', - 'collectd-rdt' + 'collectd-rdt', + 'collectd-turbostat' ] %} {% endif %} |