Validation ffu pre-upgrade and post-upgrade.

Add the pre-upgrade and post-upgrade validation for ffu. Fix the
pre-upgrade-prepare one. And fix a typo in default file.

Change-Id: I567edeb532ce35654247f9a8e34a7a99beb51fa8

defaults/main.yml

@@ -73,8 +73,8 @@ updates_validations_groups:
   - pre-update-run
   - post-update
 
-# validations groups for updates to be
-# executed if updates_validations is true.
+# validations groups for upgrades to be
+# executed if upgrades _validations is true.
 upgrades_validations_groups:
   - pre-upgrade
   - pre-system-upgrade

tasks/fast-forward-upgrade/main.yml

@@ -145,13 +145,34 @@
     - name: run pre-upgrade validation for the overcloud nodes
       import_tasks: ../common/validation_group_run.yaml
       vars:
-        validation_group: "pre-upgrade"
+        validation_group: "pre-upgrade-prepare"
         validation_allowed_groups: "{{ upgrades_validations_groups }}"
       when: run_validations|bool
       tags:
         - overcloud_upgrade_prepare
         - upgrades_validations
 
+    - name: run pre-upgrade validation
+      import_tasks: ../common/validation_group_run.yaml
+      vars:
+        validation_group: "pre-upgrade"
+        validation_allowed_groups: "{{ upgrades_validations_groups }}"
+      when: run_validations|bool
+      tags:
+        - undercloud_update
+        - upgrades_validations
+        - pre_upgrades_validations
+
+    - name: run post-update validation
+      import_tasks: ../common/validation_group_run.yaml
+      vars:
+        validation_group: "post-upgrade"
+        validation_allowed_groups: "{{ upgrades_validations_groups }}"
+      when: run_validations|bool
+      tags:
+        - uprades_validations
+        - post_upgrades_validations
+
     - name: replace environment files
       import_tasks: ../common/replace_environment_files.yaml
       tags: ffu_overcloud_prepare

tasks/update/main.yml

@@ -249,14 +249,30 @@
         - log_stages|bool
 
     - name: run post-update validation
-      import_tasks: ../common/validation_group_run.yaml
-      vars:
-        validation_group: "post-update"
-        validation_allowed_groups: "{{ updates_validations_groups }}"
-      when: run_validations|bool
-      tags:
-        - updates_validations
-        - post_update_validations
+    import_tasks: ../common/validation_group_run.yaml
+    vars:
+      validation_group: "post-update"
+      validation_allowed_groups: "{{ updates_validations_groups }}"
+    when: run_validations|bool
+    tags:
+      - updates_validations
+      - post_update_validations    - name: run post-update validation
+    import_tasks: ../common/validation_group_run.yaml
+    vars:
+      validation_group: "post-update"
+      validation_allowed_groups: "{{ updates_validations_groups }}"
+    when: run_validations|bool
+    tags:
+      - updates_validations
+      - post_update_validations   - name: run post-update validation
+    import_tasks: ../common/validation_group_run.yaml
+    vars:
+      validation_group: "post-update"
+      validation_allowed_groups: "{{ updates_validations_groups }}"
+    when: run_validations|bool
+    tags:
+      - updates_validations
+      - post_update_validations
 
     - name: validate overcloud docker images/containers
       shell: |