Merge pull request #90 from idealista/develop

Release 1.9.2

CHANGELOG.md

@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## Unreleased
 
+## [1.9.2](https://github.com/idealista/consul_role/tree/1.9.2) (2022-09-29)
+### [Full Changelog](https://github.com/idealista/consul_role/compare/1.9.1...1.9.2)
+### Fixed
+- *[#84](https://github.com/idealista/consul_role/issues/84) omit timeout if none is provided* @blalop
 
 
 ## [1.9.1](https://github.com/idealista/consul_role/tree/1.9.1) (2022-09-28)

molecule/default/group_vars/agent.yml

@@ -7,6 +7,10 @@ consul_ui: true
 consul_enable_script_check: true
 
 consul_services_register:
+  - name: node exporter http home
+    port: 9100
+    http: "http://localhost:9100"
+    interval: "60s"
   - name: node exporter http
     port: 9100
     http: "http://localhost:9100/metrics"
@@ -15,4 +19,3 @@ consul_services_register:
   - name: node exporter script
     script: "pidof node_exporter"
     interval: "60s"
-    timeout: 1

tasks/service_healthcheck.yml

@@ -8,13 +8,14 @@
   block:
     - name: Consul | Check that web server is available
       vars:
-        timeout_unit: "{{ item.timeout[-1] }}"
+        timeout: "{{ item.timeout | default(omit) }}"
+        timeout_unit: "{{ timeout[-1] }}"
         timeout_has_suffix: "{{ timeout_unit in ['s', 'm'] }}"
-        timeout_seconds: "{{ item.timeout[:-1] }}"
-        timeout_minutes: "{{ item.timeout[:-1] | int * 60 }}"
+        timeout_seconds: "{{ timeout[:-1] }}"
+        timeout_minutes: "{{ timeout[:-1] | int * 60 }}"
       uri:
         url: "{{ item.http }}"
-        timeout: "{{ (item.timeout if not timeout_has_suffix else (timeout_seconds if timeout_unit == 's' else timeout_minutes)) | default(omit) }}"
+        timeout: "{{ (timeout if not timeout_has_suffix else (timeout_seconds if timeout_unit == 's' else timeout_minutes)) }}"
         return_content: no
         status_code: 200
       when: "item.http is defined"