diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-20 10:04:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-20 10:04:05 +0000 |
| commit | 438786b35b14c135267f9de195d9da7e2d0a2ed8 (patch) | |
| tree | ac2cc4cb03fe02bb71b99edf0d77c72ad332dd9e | |
| parent | 9c3338abb004cafca82dd371915049e4ac3aa9d7 (diff) | |
| parent | 3af9151c5ac896f097e982c1786d9b04772e8b49 (diff) | |
| download | kolla-438786b35b14c135267f9de195d9da7e2d0a2ed8.tar.gz kolla-438786b35b14c135267f9de195d9da7e2d0a2ed8.zip | |
Merge "Add more collectd plugins to the container"
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index b2856fc7e..79940b1c0 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -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 |