Merge pull request #2831 from dgoodwin/upgrade-ordering

Fix rare failure to deploy new registry/router after upgrade.

playbooks/byo/openshift-cluster/upgrades/v3_3/upgrade.yml

@@ -92,9 +92,9 @@
   vars:
     master_config_hook: "v3_3/master_config_upgrade.yml"
 
-- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml
-
 - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml
   vars:
     node_config_hook: "v3_3/node_config_upgrade.yml"
 
+- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml
+

playbooks/byo/openshift-cluster/upgrades/v3_4/upgrade.yml

@@ -90,7 +90,7 @@
 
 - include: ../../../../common/openshift-cluster/upgrades/upgrade_control_plane.yml
 
-- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml
-
 - include: ../../../../common/openshift-cluster/upgrades/upgrade_nodes.yml
 
+- include: ../../../../common/openshift-cluster/upgrades/post_control_plane.yml
+