openstack
/
kolla
Code Issues Proposed changes

Merge "add collectd-pmu, collectd-rtd and collectd-turbostat to C8" into stable/train

This commit is contained in:
Zuul 2020-04-17 15:19:13 +00:00 committed by Gerrit Code Review
parent 7421423d49 fe87b4da9b
commit e9caf82645
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker/collectd/Dockerfile.j2
View File

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