From fe87b4da9b5a073d4958ddb0d05ca17857d9cdf5 Mon Sep 17 00:00:00 2001 From: Piotr Rabiega Date: Thu, 9 Apr 2020 13:11:21 +0200 Subject: add collectd-pmu, collectd-rtd and collectd-turbostat to C8 add collectd-pmu to C7 Change-Id: I1686a110c9166f477216bf7ff9db8ea6e6517917 --- docker/collectd/Dockerfile.j2 | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'docker') diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index f4447ff2b..df22b5095 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -70,19 +70,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {% if base_arch =='x86_64' %} - {% if distro_python_version.startswith('3') %} - {# NOTE(aschultz): there are some missing packages here #} - {% set collectd_packages = collectd_packages + [ - 'collectd-hugepages', - ] %} - {% else %} - {% set collectd_packages = collectd_packages + [ - 'collectd-hugepages', - 'collectd-rdt', - 'collectd-turbostat' - ] %} - {% endif %} + {% set collectd_packages = collectd_packages + [ + 'collectd-hugepages', + 'collectd-pmu', + 'collectd-rdt', + 'collectd-turbostat' + ] %} {% endif %} + {% if distro_package_manager == 'dnf' %} # make sure, collectd is pulled from centos-opstools RUN dnf config-manager --disable epel epel-modular || true -- cgit v1.2.3