From 3af9151c5ac896f097e982c1786d9b04772e8b49 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Tue, 12 Sep 2017 13:12:20 +0200
Subject: [PATCH] Add more collectd plugins to the container

Since collectd exists in both centos-opstools and also in
EPEL, we disable EPEL for collectd building.

Change-Id: I2428aea0265b1dcd050f63ea3949c112407d5d04
---
 docker/collectd/Dockerfile.j2 | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index b2856fc7ef..79940b1c09 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