plays: add flush_handlers to ensure service is running before post_tasks

ansible-middleware · Dec 8, 2023 · 94b9ca7 · 94b9ca7
1 parent 133fb27
commit 94b9ca7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/playbooks/playbook.yml b/playbooks/playbook.yml
@@ -19,6 +19,19 @@
       vars:
         amq_streams_common_skip_download: true
 
+    - name: "Ensure Kafka Connect is running and available."
+      ansible.builtin.include_role:
+        name: amq_streams_connect
+      vars:
+        connectors:
+          - { name: "file", path: "connectors/file.yml" }
+    - name: "Give a rest to the target, sometimes broker takes a while to start"
+      ansible.builtin.wait_for:
+        timeout: 60
+
+    - name: "Flush all handlers to be sure services are ready for post_tasks."
+      ansible.builtin.meta: flush_handlers
+  post_tasks:
     - name: "Ensures topics exist."
       ansible.builtin.include_role:
         name: amq_streams_broker
@@ -57,7 +70,7 @@
       vars:
         connectors:
           - { name: "file", path: "connectors/file.yml" }
-  post_tasks:
+
     - name: "Display numbers of Zookeeper instances managed by Ansible."
       ansible.builtin.debug:
         msg: "Numbers of Zookeeper instances: {{ amq_streams_zookeeper_instance_count }}."

diff --git a/playbooks/validate.yml b/playbooks/validate.yml
@@ -6,26 +6,20 @@
       ansible.builtin.include_role:
         name: "amq_streams_zookeeper"
         tasks_from: validate.yml
-      when:
-        - amq_streams_zookeeper_enabled is defined and amq_streams_zookeeper_enabled
 
     - name: "Validate Broker installation on target"
       ansible.builtin.include_role:
         name: "amq_streams_broker"
         tasks_from: validate.yml
-      when:
-        - amq_streams_broker_enabled
 
     - name: "Validate Kafka Connect installation on target"
       ansible.builtin.include_role:
         name: "amq_streams_connect"
         tasks_from: validate.yml
-      when:
-        - amq_streams_connect_enabled
 
     - name: "Validate Cruise Control installation on target"
       ansible.builtin.include_role:
         name: "amq_streams_cruise_control"
         tasks_from: validate.yml
       when:
-        - amq_streams_connect_enabled
+        - amq_streams_cruise_control_enabled is defined and amq_streams_cruise_control_enabled
diff --git a/roles/amq_streams_cruise_control/tasks/main.yml b/roles/amq_streams_cruise_control/tasks/main.yml
@@ -60,9 +60,6 @@
     - amq_streams_firewalld_enabled is defined and amq_streams_firewalld_enabled
     - amq_streams_cruise_control_port is defined
 
-
-
-
 - name: "Deploy Cruise Control as a systemd service."
   ansible.builtin.include_role:
     name: amq_streams_common