Merge "Normalize how we run validations"

tripleo_ansible/playbooks/cli-baremetal-bios-apply.yaml

@@ -21,7 +21,6 @@
   gather_facts: "{{ (tripleo_target_host is defined) | ternary(true, false) }}"
   any_errors_fatal: true
   vars:
-    run_validations: false
     concurrency: 20
     max_retries: 2
     node_timeout: 1200

tripleo_ansible/playbooks/cli-baremetal-bios-reset.yaml

@@ -21,7 +21,6 @@
   gather_facts: "{{ (tripleo_target_host is defined) | ternary(true, false) }}"
   any_errors_fatal: true
   vars:
-    run_validations: false
     concurrency: 20
     max_retries: 2
     node_timeout: 1200

tripleo_ansible/playbooks/cli-baremetal-clean.yaml

@@ -34,13 +34,6 @@
         - node_uuids is undefined
 
   tasks:
-    # Pre-cleaning validation
-    - name: Run Validations
-      command: >-
-        openstack --os-cloud undercloud tripleo validator run --group "pre-clean"
-      when:
-        - run_validations | bool
-
     - name: Set node_uuids_clean fact
       set_fact:
         node_uuids_clean: "{{ node_uuids }}"

tripleo_ansible/playbooks/cli-baremetal-introspect.yaml

@@ -57,11 +57,33 @@
         }}"
 
     # Pre-introspection validation
-    - name: Run Validations
+    - name: Validations block
-      command: >
-        openstack tripleo validator run --group "pre-introspection"
       when:
         - run_validations | bool
+      block:
+        - name: Check if validation enabled
+          set_fact:
+            validations_enabled: "{{ lookup('hiera', 'tripleo_validations_enabled') }}"
+          run_once: true
+          become: true
+
+        # Pre-introspection validation
+        # NOTE(cloudnull): The stackrc file is sourced because validations are not
+        #                  100% compatible with clouds.yaml at this time.
+        - name: Run Validations
+          shell: |-
+            source "{{ ansible_home }}/stackrc"
+            openstack --os-cloud undercloud tripleo validator run --group "pre-introspection"
+          when:
+            - validations_enabled | bool
+
+        - name: Fail if validations are disabled
+          fail:
+            msg: >-
+              Run validations were enabled but via hiera information disabled.
+              Check the configuration and try again.
+          when:
+            - not (validations_enabled | bool)
 
     # Introspect nodes
     - name: Start baremetal introspection

tripleo_ansible/playbooks/cli-baremetal-raid.yaml

@@ -21,7 +21,6 @@
   gather_facts: "{{ (tripleo_target_host is defined) | ternary(true, false) }}"
   any_errors_fatal: true
   vars:
-    run_validations: false
     concurrency: 20
     max_retries: 2
     node_timeout: 1200

tripleo_ansible/playbooks/cli-deploy-deployment-plan.yaml

@@ -35,22 +35,33 @@
         - (tripleo_target_host is defined) | ternary('ssh', 'local') == 'local'
 
   tasks:
-    - name: Check if validation enabled
+    - name: Validations block
-      command: >
-        hiera tripleo_validations_enabled
-      register: validations_enabled
-      become: true
-
-    - name: Run Validations
-      # 1. tripleo-validations does not work with clouds.yaml
-      # 2. Ignore errors as certain validations in 'pre-deployment'
-      # group i.e tls-everywhere-pre-deployment.yaml would fail.
-      shell: |
-        source "{{ ansible_home }}/stackrc"
-        openstack tripleo validator run --group "pre-deployment"
       when:
-        - validations_enabled.stdout | bool
+        - run_validations | bool
-      ignore_errors: true
+      block:
+        - name: Check if validation enabled
+          set_fact:
+            validations_enabled: "{{ lookup('hiera', 'tripleo_validations_enabled') }}"
+          run_once: true
+          become: true
+
+        # Pre-deployment validation
+        # NOTE(cloudnull): The stackrc file is sourced because validations are not
+        #                  100% compatible with clouds.yaml at this time.
+        - name: Run Validations
+          shell: |-
+            source "{{ ansible_home }}/stackrc"
+            openstack --os-cloud undercloud tripleo validator run --group "pre-deployment"
+          when:
+            - validations_enabled | bool
+
+        - name: Fail if validations are disabled
+          fail:
+            msg: >-
+              Run validations were enabled but via hiera information disabled.
+              Check the configuration and try again.
+          when:
+            - not (validations_enabled | bool)
 
     - name: Prepare Container images and update plan
       tripleo_image_params_prepare: