commit ce2cb7b355d0a8d0d899a3c073ca2b20a691d8f7
author Dmitry Kalashnik <dkalashnik@mirantis.com> Tue Nov 07 16:31:27 2017 +0400
committer Dmitry Kalashnik <dkalashnik@mirantis.com> Tue Nov 07 19:21:08 2017 +0400
tree 5aec15f12ca2470b588214e5310e5f334332423c
parent aefd039ae8c6a55500ed352a92b05f4d41614413

Add config.d watch cleanup

Change-Id: I161b68ef665f03c14975cd980ed931987caff55e

fluentd/agent.sls

diff --git a/fluentd/agent.sls b/fluentd/agent.sls
index a45d5b6..02fafbe 100644
--- a/fluentd/agent.sls
+++ b/fluentd/agent.sls
@@ -20,6 +20,13 @@
     - require:
       - pkg: fluentd_packages_agent
 
+fluentd_config_d_dir_clean:
+  file.directory:
+    - name: {{ fluentd.dir.config }}/config.d
+    - clean: True
+    - watch_in:
+      - service: fluentd_service_agent
+
 fluentd_config_service:
   file.managed:
     - name: /etc/default/td-agent
@@ -56,6 +63,8 @@
     - template: jinja
     - require:
       - pkg: fluentd_packages_agent
+    - require_in:
+      - file: fluentd_config_d_dir_clean
     - context:
       fluentd: {{ fluentd }}
 
@@ -74,6 +83,8 @@
     - require:
       - pkg: fluentd_packages_agent
       - file: fluentd_config_d_dir
+    - require_in:
+      - file: fluentd_config_d_dir_clean
     - watch_in:
       - service: fluentd_service_agent
     - defaults:
@@ -100,6 +111,8 @@
     - require:
       - pkg: fluentd_packages_agent
       - file: fluentd_config_d_dir
+    - require_in:
+      - file: fluentd_config_d_dir_clean
     - watch_in:
       - service: fluentd_service_agent
     - defaults:
@@ -126,6 +139,8 @@
     - require:
       - pkg: fluentd_packages_agent
       - file: fluentd_config_d_dir
+    - require_in:
+      - file: fluentd_config_d_dir_clean
     - watch_in:
       - service: fluentd_service_agent
     - defaults:
@@ -152,6 +167,8 @@
     - require:
       - pkg: fluentd_packages_agent
       - file: fluentd_config_d_dir
+    - require_in:
+      - file: fluentd_config_d_dir_clean
     - watch_in:
       - service: fluentd_service_agent
     - defaults: