openstack/kolla
Code Issues Proposed changes

Merge "collectd: turbostat is x86 only, it fails on Arm64"

Browse Source
This commit is contained in:
Zuul 2018-06-28 10:52:22 +00:00 committed by Gerrit Code Review
commit 44fb121994
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/collectd/Dockerfile.j2
View File

@ -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 %}