Merge "Prevent jobs timeouts when running playbook on localhost"

playbooks/baremetal-full-overcloud.yml

@@ -2,34 +2,24 @@
 - name: Deploy the overcloud
   hosts: undercloud
   gather_facts: false
-  roles:
-    - overcloud-deploy
-  tags:
-    - overcloud-deploy
-
-# Add the overcloud nodes to the generated inventory.
-- name: Inventory the overcloud
-  hosts: undercloud
-  gather_facts: true
-  tags:
-    - overcloud-deploy
-  vars:
-    inventory: all
-  roles:
-    - tripleo-inventory
-
-- name: Check the result of the deployment
-  hosts: localhost
-  tags:
-    - overcloud-deploy
   tasks:
-    - name: ensure the deployment result has been read into memory
-      include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
-
-    # overcloud_deploy_result = ["failed", "passed"]
-    - name: did the deployment pass or fail?
-      debug: var=overcloud_deploy_result
-      failed_when: overcloud_deploy_result == "failed"
+    - name: Deploy the overcloud
+      include_role:
+        name: overcloud-deploy
+      tags:
+        - overcloud-deploy
+    - name: Check the overcloud_deployment_result.json if this is CI job
+      tags:
+        - overcloud-deploy
+      block:
+        - name: ensure the deployment result has been read into memory
+          include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+          delegate_to: localhost
+        # overcloud_deploy_result = ["failed", "passed"]
+        - name: did the deployment pass or fail?
+          debug: var=overcloud_deploy_result
+          failed_when: overcloud_deploy_result == "failed"
+          delegate_to: localhost
 
 - name: Run tripleo-validations post-deployment tests
   hosts: undercloud

playbooks/multinode-multiple-overcloud.yml

@@ -13,34 +13,37 @@
 # Deploy First stack - overcloud #
 ##################################
 
-- name: Deploy the first overcloud
+- name: Deploy the overcloud
   hosts: undercloud
   gather_facts: false
-  roles:
-    - overcloud-deploy
   environment:
     TRIPLEO_ROOT: "{{ lookup('env','TRIPLEO_ROOT') }}"
-
-- name: Check the result of the deployment
-  hosts: localhost
-  tags:
-    - overcloud-deploy
   tasks:
-    - name: ensure the deployment result has been read into memory
-      include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+    - name: Deploy the overcloud
+      include_role:
+        name: overcloud-deploy
 
-    # overcloud_deploy_result = ["failed", "passed"]
-    - name: did the deployment pass or fail?
-      debug: var=overcloud_deploy_result
-      failed_when: overcloud_deploy_result == "failed"
+    - name: Check the overcloud_deployment_result.json if this is CI job
+      tags:
+        - overcloud-deploy
+      block:
+        - name: ensure the deployment result has been read into memory
+          include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+          delegate_to: localhost
+        # overcloud_deploy_result = ["failed", "passed"]
+        - name: did the deployment pass or fail?
+          debug: var=overcloud_deploy_result
+          failed_when: overcloud_deploy_result == "failed"
+          delegate_to: localhost
 
 #######################################
 # Deploy Second stack - overcloud-two #
 #######################################
-
 - name: Deploy the second overcloud
   hosts: undercloud
   gather_facts: false
+  environment:
+    TRIPLEO_ROOT: "{{ lookup('env','TRIPLEO_ROOT') }}"
   vars:
     stack_name: "overcloud-two"
     overcloud_cloud_name: "{{ stack_name }}.localdomain"
@@ -48,23 +51,23 @@
     overcloud_cloud_name_storage: "{{ stack_name }}.storage.localdomain"
     overcloud_cloud_name_storage_management: "{{ stack_name }}.storagemgmt.localdomain"
     overcloud_cloud_name_ctlplane: "{{ stack_name }}.ctlplane.localdomain"
-  roles:
-    - overcloud-deploy
-  environment:
-    TRIPLEO_ROOT: "{{ lookup('env','TRIPLEO_ROOT') }}"
-
-- name: Check the result of the deployment for overcloud-two
-  hosts: localhost
-  tags:
-    - overcloud-deploy
   tasks:
-    - name: ensure the deployment result has been read into memory
-      include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+    - name: Deploy the second overcloud
+      include_role:
+        name: overcloud-deploy
 
-    # overcloud_deploy_result = ["failed", "passed"]
-    - name: did the deployment pass or fail?
-      debug: var=overcloud_deploy_result
-      failed_when: overcloud_deploy_result == "failed"
+    - name: Check the overcloud_deployment_result.json if this is CI job
+      tags:
+        - overcloud-deploy
+      block:
+        - name: ensure the deployment result has been read into memory
+          include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+          delegate_to: localhost
+        # overcloud_deploy_result = ["failed", "passed"]
+        - name: did the deployment pass or fail?
+          debug: var=overcloud_deploy_result
+          failed_when: overcloud_deploy_result == "failed"
+          delegate_to: localhost
 
 - name: Run tripleo-validations post-deployment tests
   hosts: undercloud

playbooks/multinode-overcloud.yml

@@ -2,23 +2,28 @@
 - name: Deploy the overcloud
   hosts: undercloud
   gather_facts: false
-  roles:
-    - overcloud-deploy
   environment:
     TRIPLEO_ROOT: "{{ lookup('env','TRIPLEO_ROOT') }}"
-
-- name: Check the result of the deployment
-  hosts: localhost
-  tags:
-    - overcloud-deploy
   tasks:
-    - name: ensure the deployment result has been read into memory
-      include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+    - name: Deploy the overcloud
+      include_role:
+        name: overcloud-deploy
+      tags:
+        - overcloud-deploy
 
-    # overcloud_deploy_result = ["failed", "passed"]
-    - name: did the deployment pass or fail?
-      debug: var=overcloud_deploy_result
-      failed_when: overcloud_deploy_result == "failed"
+    - name: Check the overcloud_deployment_result.json if this is CI job
+      tags:
+        - overcloud-deploy
+      block:
+        - name: ensure the deployment result has been read into memory
+          include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+          delegate_to: localhost
+
+        # overcloud_deploy_result = ["failed", "passed"]
+        - name: did the deployment pass or fail?
+          debug: var=overcloud_deploy_result
+          failed_when: overcloud_deploy_result == "failed"
+          delegate_to: localhost
 
 - name: Run tripleo-validations post-deployment tests
   hosts: undercloud

playbooks/quickstart-extras-overcloud.yml

@@ -32,16 +32,20 @@
 
 # Check the results of the deployment, note after inventory has executed
 - name: Check the result of the deployment
-  hosts: localhost
+  hosts: undercloud
   tags:
     - overcloud-deploy
     - overcloud-check
   tasks:
-    - name: ensure the deployment result has been read into memory
-      include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
-
-    # overcloud_deploy_result = ["failed", "passed"]
-    - name: did the deployment pass or fail?
-      debug:
-        var: overcloud_deploy_result
-      failed_when: overcloud_deploy_result == "failed"
+    - name: Check the overcloud_deployment_result.json if this is CI job
+      tags:
+        - overcloud-deploy
+      block:
+        - name: ensure the deployment result has been read into memory
+          include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+          delegate_to: localhost
+        # overcloud_deploy_result = ["failed", "passed"]
+        - name: did the deployment pass or fail?
+          debug: var=overcloud_deploy_result
+          failed_when: overcloud_deploy_result == "failed"
+          delegate_to: localhost

roles/baremetal-undercloud/README.md

@@ -300,15 +300,17 @@ others coming from various related to tripleo-quickstart:
 
 # Check the results of the deployment, note after inventory has executed
 - name: Check the result of the deployment
-  hosts: localhost
+  hosts: undercloud
   tasks:
     - name: ensure the deployment result has been read into memory
       include_vars: "{{ local_working_dir }}/overcloud_deployment_result.json"
+      delegate_to: localhost
 
     # overcloud_deploy_result = ["failed", "passed"]
     - name: did the deployment pass or fail?
       debug: var=overcloud_deploy_result
       failed_when: overcloud_deploy_result == "failed"
+      delegate_to: localhost
   tags:
     - overcloud-deploy-check
 ```