telekom-mms · rndmh3ro · Oct 26, 2020 · Oct 22, 2020 · Oct 23, 2020
diff --git a/examples/icinga_service_apply.yml b/examples/icinga_service_apply.yml
@@ -7,7 +7,7 @@
     url_password: "{{ icinga_pass }}"
     object_name: "SERVICE_dummy"
     assign_filter: 'host.name="foohost"'
-    check_command: "hostalive"
+    check_command: hostalive
     display_name: "dummy process"
     imports:
       - fooservicetemplate

diff --git a/plugins/modules/icinga_service.py b/plugins/modules/icinga_service.py
@@ -372,14 +372,9 @@ def main():
         "volatile": module.params["volatile"],
     }
 
-    try:
-        icinga_object = IcingaServiceObject(
-            module=module, path="/service", data=data
-        )
-    except Exception as e:
-        module.fail_json(
-            msg="unable to connect to Icinga. Exception message: %s" % e
-        )
+    icinga_object = IcingaServiceObject(
+        module=module, path="/service", data=data
+    )
 
     changed, diff = icinga_object.update(module.params["state"])
     module.exit_json(

diff --git a/plugins/modules/icinga_service_apply.py b/plugins/modules/icinga_service_apply.py
@@ -160,6 +160,7 @@
     url_password: "{{ icinga_pass }}"
     object_name: "SERVICE_dummy"
     assign_filter: 'host.name="foohost"'
+    check_command: hostalive
     display_name: "dummy process"
     imports:
       - fooservicetemplate

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/absent_icinga_service_apply.yml b/tests/integration/targets/icinga/roles/icinga/tasks/absent_icinga_service_apply.yml
@@ -7,7 +7,7 @@
     url_password: "{{ icinga_pass }}"
     object_name: "SERVICE_dummy"
     assign_filter: 'host.name="foohost"'
-    check_command: "hostalive"
+    check_command: hostalive
     display_name: "dummy process"
     groups:
       - fooservicegroup

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/icinga_service_apply.yml b/tests/integration/targets/icinga/roles/icinga/tasks/icinga_service_apply.yml
@@ -7,7 +7,7 @@
     url_password: "{{ icinga_pass }}"
     object_name: "SERVICE_dummy"
     assign_filter: 'host.name="foohost"'
-    check_command: "hostalive"
+    check_command: hostalive
     display_name: "dummy process"
     imports:
       - fooservicetemplate

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/main.yml b/tests/integration/targets/icinga/roles/icinga/tasks/main.yml
@@ -88,6 +88,7 @@
     - wrong_pass_icinga_host.yml
     - wrong_pass_icinga_service.yml
 
+    - absent_icinga_service.yml
     - absent_icinga_host.yml
     - absent_icinga_host_template.yml
     - absent_icinga_hostgroup.yml
@@ -104,7 +105,6 @@
     - absent_icinga_timeperiod.yml
     - absent_icinga_command.yml
     - absent_icinga_command_template.yml
-    - absent_icinga_service.yml
 
 - name: deploy changes in icinga
   tags: uri

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/wrong_host_icinga_service_apply.yml b/tests/integration/targets/icinga/roles/icinga/tasks/wrong_host_icinga_service_apply.yml
@@ -7,7 +7,7 @@
     url_password: "{{ icinga_pass }}"
     object_name: "SERVICE_dummy"
     assign_filter: 'host.name="foohost"'
-    check_command: "hostalive"
+    check_command: hostalive
     display_name: "dummy process"
     imports:
       - fooservicetemplate

diff --git a/tests/integration/targets/icinga/roles/icinga/tasks/wrong_pass_icinga_service_apply.yml b/tests/integration/targets/icinga/roles/icinga/tasks/wrong_pass_icinga_service_apply.yml
@@ -7,7 +7,7 @@
     url_password: iamwrong
     object_name: "SERVICE_dummy"
     assign_filter: 'host.name="foohost"'
-    check_command: "hostalive"
+    check_command: hostalive
     display_name: "dummy process"
     imports:
       - fooservicetemplate

diff --git a/tests/integration/targets/icinga/tasks/icinga_service.yml b/tests/integration/targets/icinga/tasks/icinga_service.yml