Update ansible-checkmk_agent for rework-4

Related to: debops-contrib/ansible-checkmk_agent#28
ganto · Aug 28, 2017 · 35d114b · 35d114b
1 parent 4c1c863
commit 35d114b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/ansible-checkmk_agent/playbooks/test.yml b/ansible-checkmk_agent/playbooks/test.yml
@@ -4,32 +4,33 @@
   become: True
 
   roles:
+
+    - role: ansible-checkmk_agent/env
+
     - role: debops.apt_preferences
       apt_preferences__dependent_list:
         - '{{ checkmk_agent__apt_preferences__dependent_list }}'
 
     - role: debops.etc_services
       etc_services__dependent_list:
         - '{{ checkmk_agent__etc_services__dependent_list }}'
-      when: ('xinetd' in checkmk_agent__type|d(['ssh']))
+      when: ('xinetd' in checkmk_agent__type)
 
     - role: debops.ferm
       ferm__dependent_rules:
         - '{{ checkmk_agent__ferm__dependent_rules }}'
-      when: ('xinetd' in checkmk_agent__type|d(['ssh']))
+
+    - role: debops.tcpwrappers
+      tcpwrappers__dependent_allow:
+        - '{{ checkmk_agent__tcpwrappers__dependent_allow }}'
 
     - role: debops.authorized_keys
       authorized_keys__dependent_list:
         - '{{ checkmk_agent__authorized_keys__dependent_list }}'
-      when: ('ssh' in checkmk_agent__type|d(['ssh']))
 
     - role: debops.mariadb
-      mariadb__users:
-        - '{{ checkmk_agent__mariadb__users }}'
-      when: (("mk_mysql" in checkmk_agent__plugin_list and
-              checkmk_agent__plugin_mysql|d("automatic") == "automatic") or
-             ((checkmk_agent__plugin_autodetect|d(True) | bool) and
-              "debops_mariadb_server" in hostvars[inventory_hostname]["group_names"])
-            )
+      mariadb__dependent_users:
+        - '{{ checkmk_agent__mariadb__dependent_users }}'
+      when: ("mk_mysql" in checkmk_agent__combined_plugins)
 
     - role: ansible-checkmk_agent
diff --git a/ansible-checkmk_agent/test b/ansible-checkmk_agent/test
@@ -16,6 +16,7 @@ ansible-galaxy -f install debops.apt_preferences
 ansible-galaxy -f install debops.authorized_keys
 ansible-galaxy -f install debops.etc_services
 ansible-galaxy -f install debops.ferm
+ansible-galaxy -f install debops.tcpwrappers
 ansible-galaxy -f install debops.mariadb
 
 assert_playbook_check_runs