X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=overcloud.j2.yaml;h=f7e6f37f8ccb7bb36be9b076cba5c33653d0c329;hb=6ec44d98b4a9aee3b469f31d08dd293bcff6db0e;hp=39a092b1e88a19f2aec5882ea0d25ad3ff9bf372;hpb=d19ae9f4909b36697e224b4fd1878ebe439a679e;p=apex-tripleo-heat-templates.git

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 39a092b1..f7e6f37f 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -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 @@ resources:
       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 @@ resources:
         {{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 @@ resources:
         {{role.name}}: {get_attr: [{{role.name}}ServiceChain, role_data]}
 {% endfor %}
 
-
 outputs:
   ManagedEndpoints:
     description: Asserts that the keystone endpoints have been provisioned.