diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-17 15:19:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-17 15:19:13 +0000 |
| commit | e9caf82645740c328f5838ebd53b4ef5a0bb71b8 (patch) | |
| tree | fe05edfac03be755bbaeb2a3298e6cc48c40eb88 /docker | |
| parent | 7421423d491c3d0b6e490d57e06f50b080e20a4d (diff) | |
| parent | fe87b4da9b5a073d4958ddb0d05ca17857d9cdf5 (diff) | |
| download | kolla-e9caf82645740c328f5838ebd53b4ef5a0bb71b8.tar.gz kolla-e9caf82645740c328f5838ebd53b4ef5a0bb71b8.zip | |
Merge "add collectd-pmu, collectd-rtd and collectd-turbostat to C8" into stable/train
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 de84c669e..4e8a660d8 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -72,19 +72,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 |