Update the template_version alias for all the templates to pike.

[apex-tripleo-heat-templates.git] / overcloud.j2.yaml

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index a2d501d..e1c70dc 100644 (file)
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -7,7 +7,7 @@
 {%- endfor -%}
 {%- set primary_role_name = primary_role[0].name -%}
 # primary role is: {{primary_role_name}}
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Deploy an OpenStack environment, consisting of several node types (roles),
@@ -51,7 +51,9 @@ parameters:
     type: string
   ControlFixedIPs:
     default: []
-    description: Should be used for arbitrary ips.
+    description: >
+        Control the IP allocation for the ControlVirtualIP port. E.g.
+        [{'ip_address':'1.2.3.4'}]
     type: json
   InternalApiVirtualFixedIPs:
     default: []
@@ -169,6 +171,11 @@ parameters:
     type: json
     description: Optional scheduler hints to pass to nova
     default: {}
+
+  {{role.name}}Parameters:
+    type: json
+    description: Optional Role Specific parameters to be provided to service
+    default: {}
 {% endfor %}
 
   # Identifiers to trigger tasks on nodes
@@ -283,6 +290,8 @@ resources:
       ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
       EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
       DefaultPasswords: {get_attr: [DefaultPasswords, passwords]}
+      RoleName: {{role.name}}
+      RoleParameters: {get_param: {{role.name}}Parameters}
 
   # Filter any null/None service_names which may be present due to mapping
   # of services to OS::Heat::None
@@ -665,6 +674,7 @@ resources:
   AllNodesDeploySteps:
     type: OS::TripleO::PostDeploySteps
     depends_on:
+      - AllNodesExtraConfig
 {% for role in roles %}
       - {{role.name}}AllNodesDeployment
 {% endfor %}