Merge "Add more collectd plugins to the container"

This commit is contained in:
Jenkins 2017-09-20 10:04:05 +00:00 committed by Gerrit Code Review
commit 438786b35b

View File

@ -13,10 +13,24 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set collectd_packages = collectd_packages + [
'collectd-disk'
'collectd-apache',
'collectd-ceph',
'collectd-disk',
'collectd-python',
'collectd-virt'
] %}
{% if base_arch =='x86_64' %}
{% set collectd_packages = collectd_packages + [
'collectd-turbostat',
'collectd-hugepages'
] %}
{% endif %}
# make sure, collectd is pulled from centos-opstools
RUN yum-config-manager --disable epel
{% endif %}
{{ macros.install_packages(collectd_packages | customizable("packages")) }}
COPY extend_start.sh /usr/local/bin/kolla_extend_start