Merge "Integrate Validate-HA work into OVB jobs"

playbooks/baremetal-full-deploy.yml

@@ -5,4 +5,10 @@
 - include: ovb-setup.yml
   when: undercloud_type == 'ovb'
 
+- include: baremetal-undercloud.yml
+  when: undercloud_type == 'baremetal' and environment_type is defined
+
 - include: baremetal-quickstart-extras.yml
+
+- include: overcloud-validate-ha.yml
+  when: validate_ha_overcloud is defined and validate_ha_overcloud|bool

playbooks/baremetal-full-overcloud-prep.yml

@@ -1,21 +1,35 @@
 ---
+- name:  Prepare the undercloud networks for the overcloud deployment
+  hosts: undercloud
+  gather_facts: no
+  roles:
+    - overcloud-prep-network
+  tags:
+    - overcloud-prep-network
+
 - name:  copy over config files
   hosts: undercloud
   gather_facts: no
   roles:
     - overcloud-prep-config
+  tags:
+    - overcloud-prep-config
 
 - name:  Perpare the baremetal overcloud
   hosts: undercloud
   gather_facts: yes
   roles:
     - baremetal-prep-overcloud
+  tags:
+    - baremetal-prep-overcloud
 
 - name:  Prepare overcloud containers
   hosts: undercloud
   gather_facts: no
   roles:
     - { role: overcloud-prep-containers, when: containerized_overcloud|bool }
+  tags:
+    - overcloud-prep-containers
 
 - name: Run tripleo-validations pre-introspection tests
   hosts: undercloud
@@ -33,25 +47,25 @@
   gather_facts: no
   roles:
     - overcloud-prep-images
+  tags:
+    - overcloud-prep-images
 
 - name:  Prepare overcloud flavors
   hosts: undercloud
   gather_facts: no
   roles:
     - { role: overcloud-prep-flavors,
         when: step_overcloud_prep_flavors|default(true)|bool }
-
-- name:  Prepare the undercloud networks for the overcloud deployment
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - overcloud-prep-network
+  tags:
+    - overcloud-prep-flavors
 
 - name: Prepare the SSL Configuration for the overcloud deployment
   hosts: undercloud
   gather_facts: no
   roles:
     - { role: overcloud-ssl }
+  tags:
+    - overcloud-ssl
 
 - name: Run tripleo-validations pre-deployment tests
   hosts: undercloud

playbooks/baremetal-full-overcloud.yml

@@ -4,6 +4,8 @@
   gather_facts: no
   roles:
     - overcloud-deploy
+  tags:
+    - overcloud-deploy
 
 # Add the overcloud nodes to the generated inventory.
 - name:  Inventory the overcloud

playbooks/baremetal-full-undercloud.yml

@@ -4,6 +4,8 @@
   gather_facts: no
   roles:
     - undercloud-deploy
+  tags:
+    - undercloud-deploy
 
 - name: Configure tripleo-validations
   hosts: undercloud
@@ -21,6 +23,8 @@
   roles:
     - { role: validate-undercloud,
         when: run_validate_undercloud|default(false)|bool }
+  tags:
+    - validate-undercloud
 
 - name: Build images for quickstart
   hosts: undercloud

playbooks/baremetal-undercloud.yml

@@ -29,159 +29,3 @@
     - baremetal-undercloud/packages
   tags:
     - undercloud-pkgs-install
-
-- name: Deploy the undercloud
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - undercloud-deploy
-  tags:
-    - undercloud-deploy
-
-- name: Configure tripleo-validations
-  hosts: undercloud
-  gather_facts: no
-  tags:
-    - tripleo-validations
-  vars:
-    run_tripleo_validations_setup: True
-  roles:
-    - { role: tripleo-validations,
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
-
-- name: Prepare baremetal for the overcloud deployment
-  hosts: undercloud
-  roles:
-    - baremetal-prep-overcloud
-  tags:
-    - baremetal-prep-overcloud
-
-- name: Prepare configuration files for the overcloud deployment
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - overcloud-prep-config
-  tags:
-    - overcloud-prep-config
-
-- name:  Prepare overcloud containers
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - overcloud-prep-containers
-  tags:
-    - overcloud-prep-containers
-
-- name: Fetch the overcloud images
-  hosts: undercloud
-  gather_facts: no
-  become: true
-  roles:
-    - fetch-images
-  tags:
-    - overcloud-fetch-images
-
-- name: Prepare the overcloud images for deployment
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - overcloud-prep-images
-  tags:
-    - overcloud-prep-images
-
-- name: Run tripleo-validations pre-introspection tests
-  hosts: undercloud
-  gather_facts: no
-  tags:
-    - tripleo-validations
-  vars:
-    validations_group: ['pre-introspection']
-  roles:
-    - { role: tripleo-validations,
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
-
-- name: Prepare overcloud flavors
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - overcloud-prep-flavors
-  tags:
-    - overcloud-prep-flavors
-
-- name: Prepare the undercloud networks for the overcloud deployment
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - overcloud-prep-network
-  tags:
-    - overcloud-prep-network
-
-- name: Prepare SSL for the overcloud
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - overcloud-ssl
-  tags:
-    - overcloud-ssl
-
-- name: Run tripleo-validations pre-deployment tests
-  hosts: undercloud
-  gather_facts: no
-  tags:
-    - tripleo-validations
-  vars:
-    validations_group: ['pre-deployment']
-  roles:
-    - { role: tripleo-validations,
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
-
-- name: Deploy the overcloud
-  hosts: undercloud
-  gather_facts: yes
-  roles:
-    - overcloud-deploy
-  tags:
-    - overcloud-deploy
-
-- name: Run tripleo-validations post-deployment tests
-  hosts: undercloud
-  gather_facts: no
-  tags:
-    - tripleo-validations
-  vars:
-    validations_group: ['post-deployment']
-  roles:
-    - { role: tripleo-validations,
-        when: run_tripleo_validations|bool or run_tripleo_validations_negative_tests|bool}
-
-- name: Add the overcloud nodes to the generated inventory
-  hosts: undercloud
-  gather_facts: yes
-  vars:
-      inventory: all
-  roles:
-    - tripleo-inventory
-  tags:
-    - overcloud-inventory
-
-- name: Check the result of the deployment
-  hosts: localhost
-  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"
-  tags:
-    - overcloud-deploy-check
-
-- name: Validate the overcloud
-  hosts: undercloud
-  gather_facts: no
-  roles:
-    - { role: validate-simple, when: test_ping|bool }
-  tags:
-    - overcloud-validate
-