refinements for split-host-job-launch-webhook-files.yml

split-host-job-launch-webhook-files.yml

@@ -10,18 +10,11 @@
 
 
   tasks:
+    - name: Provision hosts defined via tower_provision_host or defaults
+      block:
       - name: Set provision_host to tower_provision_host or default
         set_fact:
           provision_host: "{{ tower_provision_host | default(ansible_play_hosts | join(',')) }}"
-      when: tower_webhook_payload is not defined
-
-
-    - name: Set provision_host to Webhook files
-      set_fact:
-        provision_host: "{{ [item | split('/') | last] + provision_host | default([]) }}"
-      loop: "{{ tower_webhook_payload.commits[0].added + tower_webhook_payload.commits[0].modified }}"
-      when: tower_webhook_payload is defined
-
 
       - name: "Create in-memory inventory for tower_provision_host"
         add_host:
@@ -33,6 +26,13 @@
       when: tower_webhook_payload is not defined
 
 
+    - name: Provision hosts defined via tower_webhook_payload
+      block:
+      - name: Set provision_host to Webhook files
+        set_fact:
+          provision_host: "{{ [item | split('/') | last] + provision_host | default([]) }}"
+        loop: "{{ tower_webhook_payload.commits[0].added + tower_webhook_payload.commits[0].modified }}"
+
       - name: "Create in-memory inventory for Webhook"
         add_host:
           name: "{{ item }}"