Change consul cluster check logic (#9)

* Change consul cluster check logic --------- Co-authored-by: Carlos Gonzalez <[email protected]>
nephelaiio · Jun 5, 2024 · 01c34aa · 01c34aa
1 parent f5acf0c
commit 01c34aa
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 32 deletions.
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: nephelaiio
 name: consul
-version: 0.0.8
+version: 0.0.9
 readme: README.md
 authors:
   - Ted Cook <[email protected]>

diff --git a/playbooks/update.yml b/playbooks/update.yml
@@ -21,35 +21,25 @@
       ansible.builtin.reboot:
         reboot_timeout: "{{ consul_reboot_timeout | default(300) }}"
 
-    - name: Verify Consul cluster status
-      block:
-        - name: Query Consul node cluster status
-          ansible.builtin.shell: "consul members listNode | grep {{ inventory_hostname }} | awk '{print $3}'"
-          register: _consul_node_status
-          changed_when: false
-          no_log: true
+    - name: Query Consul node cluster status
+      ansible.builtin.shell: "consul members listNode | grep {{ inventory_hostname }} | awk '{print $3}'"
+      vars:
+        _status: "{{ _consul_node_status.stdout }}"
+        _expected: 'alive'
+      register: _consul_node_status
+      retries: "{{ consul_task_retries | default('10') }}"
+      delay: "{{ consul_task_delay | default('10') }}"
+      until: _status == _expected
+      changed_when: false
+      no_log: true
 
-        - name: Check Consul node cluster status
-          ansible.builtin.assert:
-            that: _status == _expected
-            fail_msg: "Expected consul node type '{{ _expected }}', got '{{ _status }}'"
-            success_msg: "Consul node type is '{{ _status }}'"
-          vars:
-            _status: "{{ _consul_node_status.stdout }}"
-            _expected: 'alive'
-
-    - name: Verify Consul node type status
-      block:
-        - name: Query consul node cluster status
-          ansible.builtin.shell: "consul members listNode | grep {{ inventory_hostname }} | awk '{print $4}'"
-          register: _consul_node_type
-          changed_when: false
-
-        - name: Check consul node cluster status
-          ansible.builtin.assert:
-            that: _status == _expected
-            fail_msg: "Expected consul node type '{{ _expected }}', got '{{ _status }}'"
-            success_msg: "Consul node type is '{{ _status }}'"
-          vars:
-            _status: "{{ _consul_node_type.stdout }}"
-            _expected: 'server'
+    - name: Query consul node cluster status
+      ansible.builtin.shell: "consul members listNode | grep {{ inventory_hostname }} | awk '{print $4}'"
+      vars:
+        _status: "{{ _consul_node_type.stdout }}"
+        _expected: 'server'
+      register: _consul_node_type
+      retries: "{{ consul_task_retries | default('10') }}"
+      delay: "{{ consul_task_delay | default('10') }}"
+      until: _status == _expected
+      changed_when: false