Merge "Don't merge /etc/collectd.d" into stable/queens

2018-10-03 01:42:54 +00:00 · 2018-10-03 01:42:54 +00:00 · b07a7277d3
parent 7e463b99e2 cfc4ab2181
commit b07a7277d3
1 changed files with 4 additions and 0 deletions
--- a/docker/services/collectd.yaml
+++ b/docker/services/collectd.yaml
@ -84,6 +84,10 @@ outputs:
              dest: "/"
              merge: true
              preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src/etc/collectd.d"
+              dest: "/etc/"
+              merge: false
+              preserve_properties: true
          permissions:
            - path: /var/log/collectd
              owner: collectd:collectd