Merge "Run upgrade steps before post-deploy config"

diff --combined overcloud.j2.yaml
index 8093649,c40b099..f7e6f37
--- 1/overcloud.j2.yaml
--- 2/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@@ -477,7 -477,7 +477,7 @@@ resources
      type: OS::TripleO::Network
  
    ControlVirtualIP:
 -    type: OS::Neutron::Port
 +    type: OS::TripleO::Network::Ports::ControlPlaneVipPort
      depends_on: Networks
      properties:
        name: control_virtual_ip
@@@ -587,9 -587,9 +587,9 @@@
        servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]}
  {% endfor %}
  
-   # Post deployment steps for all roles
-   AllNodesDeploySteps:
-     type: OS::TripleO::PostDeploySteps
+   # Upgrade steps for all roles
+   AllNodesUpgradeSteps:
+     type: OS::TripleO::UpgradeSteps
      depends_on:
  {% for role in roles %}
        - {{role.name}}AllNodesDeployment
@@@ -604,10 -604,10 +604,10 @@@
          {{role.name}}: {get_attr: [{{role.name}}ServiceChain, role_data]}
  {% endfor %}
  
-   # Upgrade steps for all roles
-   AllNodesUpgradeSteps:
-     type: OS::TripleO::UpgradeSteps
-     depends_on: AllNodesDeploySteps
+   # Post deployment steps for all roles
+   AllNodesDeploySteps:
+     type: OS::TripleO::PostDeploySteps
+     depends_on: AllNodesUpgradeSteps
      properties:
        servers:
  {% for role in roles %}
@@@ -618,7 -618,6 +618,6 @@@
          {{role.name}}: {get_attr: [{{role.name}}ServiceChain, role_data]}
  {% endfor %}
  
- 
  outputs:
    ManagedEndpoints:
      description: Asserts that the keystone endpoints have been provisioned.