Merge pull request #5594 from ingvagabund/move-health-checks-and-ctrl-plane-ver-before-excluders

move health-checks and control-plane-verification before excluders

playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml

@@ -55,6 +55,10 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_control_plane_running.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
@@ -75,10 +79,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_control_plane_running.yml
-  tags:
-  - pre_upgrade
-
 - include: ../../../openshift-master/validate_restart.yml
   tags:
   - pre_upgrade

playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml

@@ -55,6 +55,14 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_health_checks.yml
+  tags:
+  - pre_upgrade
+
+- include: ../pre/verify_control_plane_running.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
@@ -75,14 +83,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_health_checks.yml
-  tags:
-  - pre_upgrade
-
-- include: ../pre/verify_control_plane_running.yml
-  tags:
-  - pre_upgrade
-
 - include: ../../../openshift-master/validate_restart.yml
   tags:
   - pre_upgrade

playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml

@@ -48,6 +48,10 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_health_checks.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
@@ -68,10 +72,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_health_checks.yml
-  tags:
-  - pre_upgrade
-
 - name: Verify masters are already upgraded
   hosts: oo_masters_to_config
   tags:

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml

@@ -59,6 +59,14 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_health_checks.yml
+  tags:
+  - pre_upgrade
+
+- include: ../pre/verify_control_plane_running.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_master_excluders.yml
   tags:
   - pre_upgrade
@@ -79,14 +87,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_health_checks.yml
-  tags:
-  - pre_upgrade
-
-- include: ../pre/verify_control_plane_running.yml
-  tags:
-  - pre_upgrade
-
 - include: ../../../openshift-master/validate_restart.yml
   tags:
   - pre_upgrade

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_nodes.yml

@@ -48,6 +48,10 @@
   tags:
   - pre_upgrade
 
+- include: ../pre/verify_health_checks.yml
+  tags:
+  - pre_upgrade
+
 - include: ../disable_node_excluders.yml
   tags:
   - pre_upgrade
@@ -68,10 +72,6 @@
     # docker is configured and running.
     skip_docker_role: True
 
-- include: ../pre/verify_health_checks.yml
-  tags:
-  - pre_upgrade
-
 - name: Verify masters are already upgraded
   hosts: oo_masters_to_config
   tags: