1 files changed, 41 insertions, 20 deletions

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 4911fbe9..b45736c1 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -28,9 +28,13 @@ parameters:
     constraints:
       - custom_constraint: nova.keypair
 {% endif %}
+  NeutronPhysicalBridge:
+    default: 'br-ex'
+    description: An OVS bridge to create for accessing tenant networks.
+    type: string
   NeutronPublicInterface:
     default: nic1
-    description: What interface to bridge onto br-ex for network nodes.
+    description: Which interface to add to the NeutronPhysicalBridge.
     type: string
   ServiceNetMap:
     default: {}
@@ -164,6 +168,24 @@ parameters:
   RoleParameters:
     type: json
     description: Role Specific Parameters
+  DeploymentSwiftDataMap:
+    type: json
+    description: |
+      Map of servers to Swift container and object for storing deployment data.
+      The keys are the Heat assigned hostnames, and the value is a map of the
+      container/object name in Swift. Example value:
+        overcloud-controller-0:
+          container: overcloud-controller
+          object: 0
+        overcloud-controller-1:
+          container: overcloud-controller
+          object: 1
+        overcloud-controller-2:
+          container: overcloud-controller
+          object: 2
+        overcloud-novacompute-0:
+          container: overcloud-compute
+          object: 0
     default: {}
 
 conditions:
@@ -172,10 +194,16 @@ conditions:
       equals:
         - {get_param: [DeploymentServerBlacklistDict, {get_param: Hostname}]}
         - 1
+  deployment_swift_data_map_unset:
+    equals:
+      - get_param:
+          - DeploymentSwiftDataMap
+          - {get_param: Hostname}
+      - ""
 
 resources:
   {{role}}:
-    type: OS::TripleO::{{role.name}}Server
+    type: OS::TripleO::{{role}}Server
     metadata:
       os-collect-config:
         command: {get_param: ConfigCommand}
@@ -200,6 +228,12 @@ resources:
           - {get_param: {{role}}ServerMetadata}
           - {get_param: ServiceMetadataSettings}
       scheduler_hints: {get_param: {{role}}SchedulerHints}
+      deployment_swift_data:
+        if:
+          - deployment_swift_data_map_unset
+          - {}
+          - {get_param: [DeploymentSwiftDataMap,
+                         {get_param: Hostname}]}
 
   # Combine the NodeAdminUserData and NodeUserData mime archives
   UserData:
@@ -399,7 +433,7 @@ resources:
     properties:
       server: {get_resource: {{role}}}
       RoleParameters: {get_param: RoleParameters}
-      deployment_actions: {get_attr: [DeploymentActions, value]}
+      ServiceNames: {get_param: ServiceNames}
 
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
@@ -410,7 +444,7 @@ resources:
       server: {get_resource: {{role}}}
       actions: {get_param: NetworkDeploymentActions}
       input_values:
-        bridge_name: br-ex
+        bridge_name: {get_param: NeutronPhysicalBridge}
         interface_name: {get_param: NeutronPublicInterface}
       actions:
         if:
@@ -512,9 +546,6 @@ resources:
   {{role}}ExtraConfigPre:
     depends_on: {{role}}Deployment
     type: OS::TripleO::{{role}}ExtraConfigPre
-    # We have to use conditions here so that we don't break backwards
-    # compatibility with templates everywhere
-    condition: server_not_blacklisted
     properties:
         server: {get_resource: {{role}}}
 
@@ -523,9 +554,6 @@ resources:
   NodeExtraConfig:
     depends_on: [{{role}}ExtraConfigPre, NodeTLSCAData]
     type: OS::TripleO::NodeExtraConfig
-    # We have to use conditions here so that we don't break backwards
-    # compatibility with templates everywhere
-    condition: server_not_blacklisted
     properties:
         server: {get_resource: {{role}}}
 
@@ -548,21 +576,11 @@ resources:
           - ['CREATE', 'UPDATE']
           - []
 
-  DeploymentActions:
-    type: OS::Heat::Value
-    properties:
-      value:
-        if:
-          - server_not_blacklisted
-          - ['CREATE', 'UPDATE']
-          - []
-
   SshHostPubKey:
     type: OS::TripleO::Ssh::HostPubKey
     depends_on: {{role}}Deployment
     properties:
         server: {get_resource: {{role}}}
-        deployment_actions: {get_attr: [DeploymentActions, value]}
 
 outputs:
   ip_address:
@@ -665,3 +683,6 @@ CTLPLANEIP,CTLPLANEHOST.DOMAIN,CTLPLANEHOST HOSTSSHPUBKEY"
   management_ip_address:
     description: IP address of the server in the management network
     value: {get_attr: [ManagementPort, ip_address]}
+  os_collect_config:
+    description: The os-collect-config configuration associated with this server resource
+    value: {get_attr: [{{role}}, os_collect_config]}