Implemented msekania's suggestions.

Author: lgetwan

plugins/module_utils/discovery.py

@@ -65,7 +65,7 @@ class Discovery:
     def __init__(self, module, logger):
         self.module = module
         self.logger = logger
-        self.timeout = module.params.get("wait_timeout", 15)
+        self.timeout = module.params.get("wait_timeout", -1)
         self.wait_for_previous = module.params.get("wait_for_previous", True)
         self.wait_for_completion = module.params.get("wait_for_completion", True)
         self.single_mode = self._single_mode()

plugins/module_utils/discovery_230.py

@@ -38,6 +38,26 @@
     "monitor_undecided_services",
 ]
 
+MONITOR_UNDECIDED_SERVICES = [
+    "new",
+    "fix_all",
+    "monitor_undecided_services",
+]
+
+REMOVE_VANISHED_SERVICES = ["remove", "fix_all"]
+
+UPDATE_SERVICE_LABELS = [
+    "only_service_labels",
+    "fix_all",
+    "new",
+]
+
+UPDATE_HOST_LABELS = [
+    "new",
+    "fix_all",
+    "only_host_labels",
+]
+
 SUPPORTED_VERSIONS = {
     "min": "2.3.0",
     "max": "2.3.0p99",
@@ -97,17 +117,16 @@ def post(self):
             }
         else:
             # Use the new parameter "options"
-            if self.params.get("state") in [
-                "new",
-                "fix_all",
-                "monitor_undecided_services",
-            ]:
+            if self.params.get("state") in MONITOR_UNDECIDED_SERVICES:
                 options["monitor_undecided_services"] = True
-            if self.params.get("state") in ["remove", "fix_all"]:
+
+            if self.params.get("state") in REMOVE_VANISHED_SERVICES:
                 options["remove_vanished_services"] = True
-            if self.params.get("state") in ["only_service_labels", "fix_all", "new"]:
+
+            if self.params.get("state") in UPDATE_SERVICE_LABELS:
                 options["update_service_labels"] = True
-            if self.params.get("state") in ["new", "fix_all", "only_host_labels"]:
+
+            if self.params.get("state") in UPDATE_HOST_LABELS:
                 options["update_host_labels"] = True
 
             data = {
@@ -182,10 +201,14 @@ def _service_completion_api(self):
 
     def _wait_for_completion(self, what):
         now = time.time()
-        deadline = now + self.timeout
+        if self.timeout > 0:
+            deadline = now + self.timeout
+        else:
+            deadline = 0  # In case of infinite timeout
+
         while True:
             now = time.time()
-            if now > deadline:
+            if self.timeout > 0 and now > deadline:
                 return generate_result(
                     msg="Timeout reached while waiting for %s discovery" % what
                 )

plugins/module_utils/discovery_240.py

@@ -38,6 +38,31 @@
     "monitor_undecided_services",
 ]
 
+MONITOR_UNDECIDED_SERVICES = [
+    "new",
+    "fix_all",
+    "refresh",
+    "tabula_rasa",
+    "monitor_undecided_services",
+]
+
+REMOVE_VANISHED_SERVICES = ["remove", "fix_all", "refresh", "tabula_rasa"]
+
+UPDATE_SERVICE_LABELS = [
+    "only_service_labels",
+    "fix_all",
+    "refresh",
+    "tabula_rasa",
+]
+
+UPDATE_HOST_LABELS = [
+    "new",
+    "fix_all",
+    "only_host_labels",
+    "refresh",
+    "tabula_rasa",
+]
+
 SUPPORTED_VERSIONS = {
     "min": "2.4.0",
     "max": "2.4.0p99",
@@ -86,30 +111,16 @@ def post(self):
             "update_host_labels": False,
         }
 
-        if self.params.get("state") in [
-            "new",
-            "fix_all",
-            "refresh",
-            "tabula_rasa",
-            "monitor_undecided_services",
-        ]:
+        if self.params.get("state") in MONITOR_UNDECIDED_SERVICES:
             options["monitor_undecided_services"] = True
-        if self.params.get("state") in ["remove", "fix_all", "refresh", "tabula_rasa"]:
+
+        if self.params.get("state") in REMOVE_VANISHED_SERVICES:
             options["remove_vanished_services"] = True
-        if self.params.get("state") in [
-            "only_service_labels",
-            "fix_all",
-            "refresh",
-            "tabula_rasa",
-        ]:
+
+        if self.params.get("state") in UPDATE_SERVICE_LABELS:
             options["update_service_labels"] = True
-        if self.params.get("state") in [
-            "new",
-            "fix_all",
-            "only_host_labels",
-            "refresh",
-            "tabula_rasa",
-        ]:
+
+        if self.params.get("state") in UPDATE_HOST_LABELS:
             options["update_host_labels"] = True
 
         data = {
@@ -184,7 +195,11 @@ def _service_completion_api(self):
 
     def _wait_for_completion(self, what, job_id=None):
         now = time.time()
-        deadline = now + self.timeout
+
+        if self.timeout > 0:
+            deadline = now + self.timeout
+        else:
+            deadline = 0  # In case of infinite timeout
 
         if self.bulk_mode and not job_id:
             return generate_result(
@@ -198,7 +213,7 @@ def _wait_for_completion(self, what, job_id=None):
 
         while True:
             now = time.time()
-            if now > deadline:
+            if self.timeout > 0 and now > deadline:
                 return generate_result(
                     msg="Timeout reached while waiting for %s discovery" % what
                 )

plugins/modules/discovery.py

@@ -73,7 +73,7 @@
     wait_timeout:
         description: The time in seconds to wait for (previous/current) completion.
         type: int
-        default: 15
+        default: -1 (infinite)
 
 
 author:
@@ -202,7 +202,7 @@ def run_module():
         ignore_errors=dict(type="bool", default=True),
         wait_for_completion=dict(type="bool", default=True),
         wait_for_previous=dict(type="bool", default=True),
-        wait_timeout=dict(type="int", default=15),
+        wait_timeout=dict(type="int", default=-1),
     )
     module = AnsibleModule(
         argument_spec=module_args,