X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fcollectd.yaml;h=0593e41225ad99f692f944f70d93379246274031;hb=69ef806c798598b4d90406644f39e5280de55f23;hp=e6741156d0343ceb7008135d3aafcd17e0c4771b;hpb=876bafb8e91582a4fed83514d9db0cfc3bc756d1;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index e6741156..0593e412 100644
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@@ -79,6 +79,11 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/collectd.json:
           command: /usr/sbin/collectd -f
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/collectd
               owner: collectd:collectd
@@ -99,9 +104,7 @@ outputs:
                 -
                   - /var/run/docker.sock:/var/run/docker.sock:rw
                   - /var/lib/kolla/config_files/collectd.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/collectd/etc/collectd.conf:/etc/collectd.conf:ro
-                  - /var/lib/config-data/collectd/etc/collectd.d:/etc/collectd.d:ro
-                  - /var/log/containers/collectd:/var/log/collectd:rw
+                  - /var/lib/config-data/puppet-generated/collectd/:/var/lib/kolla/config_files/src:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: