Merge pull request #127 from Icinga/fix/el-non-idempotent

Fix non-idenpotence during feature disabling

Author: martialblog

changelogs/fragments/fix_idempotence_el.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Fix non-idenpotence during feature disabling

plugins/action/icinga2_object.py

@@ -43,18 +43,18 @@ def run(self, tmp=None, task_vars=None):
         path = task_vars['icinga2_fragments_path'] + '/' + obj['file'] + '/'
         file_fragment = path + obj['order'] + '_' + object_type.lower() + '-' + obj['name']
 
-        file_args = dict()
-        file_args['state'] = 'directory'
-        file_args['path'] = path
-        file_module = self._execute_module(
-            module_name='file',
-            module_args=file_args,
-            task_vars=task_vars,
-            tmp=tmp
-        )
-        result = merge_hash(result, file_module)
-
         if obj['state'] != 'absent':
+            file_args = dict()
+            file_args['state'] = 'directory'
+            file_args['path'] = path
+            file_module = self._execute_module(
+                module_name='file',
+                module_args=file_args,
+                task_vars=task_vars,
+                tmp=tmp
+            )
+            result = merge_hash(result, file_module)
+
             varlist = list()  # list of variables from 'apply for'
 
             #

roles/icinga2/tasks/configure.yml

@@ -45,8 +45,8 @@
     - item.path not in _icinga2_custom_conf_paths
 
 - name: collect empty config dirs
-  shell: >
-    find {{ icinga2_fragments_path }} -type d -empty
+  shell: >-
+    find {{ icinga2_fragments_path }} -mindepth 1 -type d -empty
   register: _empty_result
   check_mode: false
   changed_when: _empty_result.stdout_lines |length > 0