Merge "Make NeutronEnableDVR parameter consistent"

[apex-tripleo-heat-templates.git] / docker / services / collectd.yaml

diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml
index e674115..0593e41 100644 (file)
--- 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: