diff options
| author | Piotr Rabiega <piotrx.rabiega@intel.com> | 2020-04-09 13:11:21 +0200 |
|---|---|---|
| committer | Piotr Rabiega <piotrx.rabiega@intel.com> | 2020-04-09 14:26:40 +0200 |
| commit | fe87b4da9b5a073d4958ddb0d05ca17857d9cdf5 (patch) | |
| tree | 2163bb2681711a1daebae8af9ee5c9c398afb645 /docker | |
| parent | 2506a14dbd4c4c4ddb26871a0cad251b5718ca59 (diff) | |
| download | kolla-fe87b4da9b5a073d4958ddb0d05ca17857d9cdf5.tar.gz kolla-fe87b4da9b5a073d4958ddb0d05ca17857d9cdf5.zip | |
add collectd-pmu, collectd-rtd and collectd-turbostat to C8
add collectd-pmu to C7
Change-Id: I1686a110c9166f477216bf7ff9db8ea6e6517917
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 19 |
1 files changed, 7 insertions, 12 deletions
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 |