Change flat network name for nosdn fdio scenario
[apex-tripleo-heat-templates.git] / puppet / role.role.j2.yaml
index b45736c..6e34cf7 100644 (file)
@@ -1,21 +1,40 @@
+{#- ## Some variables are set to enable rendering backwards compatible templates #}
+{#- ## where a few parameter/resource names don't match the expected pattern #}
+{#- ## FIXME: we need some way to deprecate the old inconsistent parameters #}
+{%- set server_resource_name = role.deprecated_server_resource_name|default(role.name) -%}
 heat_template_version: pike
-description: 'OpenStack {{role}} node configured by Puppet'
+description: 'OpenStack {{role.name}} node configured by Puppet'
 parameters:
-  Overcloud{{role}}Flavor:
-    description: Flavor for the {{role}} node.
-    default: baremetal
+{%- set default_flavor_name = 'baremetal' %}
+{%- if role.deprecated_param_flavor is defined %}
+  {{role.deprecated_param_flavor}}:
+    description: DEPRECATED Use Overcloud{{role.name}}Flavor instead.
+    default: {{default_flavor_name}}
     type: string
-{% if disable_constraints is not defined %}
+{%- endif %}
+  Overcloud{{role.name}}Flavor:
+    description: Flavor for the {{role.name}} node.
+    default: {{default_flavor_name}}
+    type: string
+{%- if role.disable_constraints is not defined %}
     constraints:
       - custom_constraint: nova.flavor
-{% endif %}
-  {{role}}Image:
+{%- endif %}
+{%- set default_image_name = 'overcloud-full' %}
+{%- if role.deprecated_param_image is defined %}
+  {{role.deprecated_param_image}}:
+    type: string
+    default: {{default_image_name}}
+    description: DEPRECATED Use {{role.name}}Image instead
+{%- endif %}
+  {{role.name}}Image:
     type: string
-    default: overcloud-full
-{% if disable_constraints is not defined %}
+    default: {{default_image_name}}
+    description: The disk image file to use for the role.
+{%- if role.disable_constraints is not defined %}
     constraints:
       - custom_constraint: glance.image
-{% endif %}
+{%- endif %}
   ImageUpdatePolicy:
     default: 'REBUILD_PRESERVE_EPHEMERAL'
     description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
@@ -24,13 +43,13 @@ parameters:
     description: Name of an existing Nova key pair to enable SSH access to the instances
     type: string
     default: default
-{% if disable_constraints is not defined %}
+{%- if role.disable_constraints is not defined %}
     constraints:
       - custom_constraint: nova.keypair
-{% endif %}
+{%- endif %}
   NeutronPhysicalBridge:
     default: 'br-ex'
-    description: An OVS bridge to create for accessing tenant networks.
+    description: An OVS bridge to create for accessing external networks.
     type: string
   NeutronPublicInterface:
     default: nic1
@@ -63,16 +82,34 @@ parameters:
     default: {}
     description: |
       Additional hiera configuration to inject into the cluster. Note
-      that {{role}}ExtraConfig takes precedence over ExtraConfig.
+      that {{role.name}}ExtraConfig takes precedence over ExtraConfig.
     type: json
-  {{role}}ExtraConfig:
+  {{role.name}}ExtraConfig:
     default: {}
     description: |
       Role specific additional hiera configuration to inject into the cluster.
     type: json
-  {{role}}IPs:
+{%- if role.deprecated_param_extraconfig is defined %}
+  {{role.deprecated_param_extraconfig}}:
+    default: {}
+    description: |
+      DEPRECATED use {{role.name}}ExtraConfig instead
+    type: json
+{%- endif %}
+  {{role.name}}IPs:
+    default: {}
+    type: json
+{%- if role.deprecated_param_ips is defined %}
+  {{role.deprecated_param_ips}}:
     default: {}
+    description: DEPRECATED - use {{role.name}}IPs instead
     type: json
+{%- endif %}
+  {{role.name}}NetworkDeploymentActions:
+    type: comma_delimited_list
+    description: >
+      Heat action when to apply network configuration changes
+    default: []
   NetworkDeploymentActions:
     type: comma_delimited_list
     description: >
@@ -91,7 +128,7 @@ parameters:
     description: >
       The DNS domain used for the hosts. This must match the
       overcloud_domain_name configured on the undercloud.
-  {{role}}ServerMetadata:
+  {{role.name}}ServerMetadata:
     default: {}
     description: >
       Extra properties or metadata passed to Nova for the created nodes in
@@ -99,6 +136,12 @@ parameters:
       role-specific and is merged with the values given to the ServerMetadata
       parameter.
     type: json
+{%- if role.deprecated_param_metadata is defined %}
+  {{role.deprecated_param_metadata}}:
+    default: {}
+    description: DEPRECATED - use {{role.name}}ServerMetadata instead
+    type: json
+{%- endif %}
   ServerMetadata:
     default: {}
     description: >
@@ -106,7 +149,7 @@ parameters:
       the overcloud. It's accessible via the Nova metadata API. This applies to
       all roles and is merged with a role-specific metadata parameter.
     type: json
-  {{role}}SchedulerHints:
+  {{role.name}}SchedulerHints:
     type: json
     description: Optional scheduler hints to pass to nova
     default: {}
@@ -167,7 +210,8 @@ parameters:
       parameter is generated from the parent template.
   RoleParameters:
     type: json
-    description: Role Specific Parameters
+    description: Parameters specific to the role
+    default: {}
   DeploymentSwiftDataMap:
     type: json
     description: |
@@ -188,6 +232,18 @@ parameters:
           object: 0
     default: {}
 
+{% if role.uses_deprecated_params is defined %}
+parameter_groups:
+- label: deprecated
+  description: Do not use deprecated params, they will be removed.
+  parameters:
+{%- for property in role %}
+{%- if property.startswith('deprecated_param_') and not role[property].endswith('SchedulerHints') %}
+  - {{role[property]}}
+{%- endif %}
+{%- endfor %}
+{%- endif %}
+
 conditions:
   server_not_blacklisted:
     not:
@@ -200,18 +256,53 @@ conditions:
           - DeploymentSwiftDataMap
           - {get_param: Hostname}
       - ""
+{%- if role.deprecated_param_image is defined %}
+  deprecated_param_image_set:
+    not:
+      equals:
+        - {get_param: {{role.deprecated_param_image}}}
+        - {{default_image_name}}
+{%- endif %}
+{%- if role.deprecated_param_flavor is defined %}
+  deprecated_param_flavor_set:
+    not:
+      equals:
+        - {get_param: {{role.deprecated_param_flavor}}}
+        - {{default_flavor_name}}
+{%- endif %}
+  role_network_deployment_actions_exists:
+    not:
+      equals:
+        - {get_param: {{role.name}}NetworkDeploymentActions}
+        - []
 
 resources:
-  {{role}}:
-    type: OS::TripleO::{{role}}Server
+  {{server_resource_name}}:
+    type: OS::TripleO::{{role.name}}Server
     metadata:
       os-collect-config:
         command: {get_param: ConfigCommand}
         splay: {get_param: ConfigCollectSplay}
     properties:
-      image: {get_param: {{role}}Image}
+      image:
+{%- if role.deprecated_param_image is defined %}
+        if:
+          - deprecated_param_image_set
+          - {get_param: {{role.deprecated_param_image}}}
+          - {get_param: {{role.name}}Image}
+{%- else %}
+        get_param: {{role.name}}Image
+{%- endif %}
       image_update_policy: {get_param: ImageUpdatePolicy}
-      flavor: {get_param: Overcloud{{role}}Flavor}
+      flavor: 
+{%- if role.deprecated_param_flavor is defined %}
+        if:
+          - deprecated_param_flavor_set
+          - {get_param: {{role.deprecated_param_flavor}}}
+          - {get_param: Overcloud{{role.name}}Flavor}
+{%- else %}
+        get_param: Overcloud{{role.name}}Flavor
+{%- endif %}
       key_name: {get_param: KeyName}
       networks:
         - network: ctlplane
@@ -225,9 +316,12 @@ resources:
       metadata:
         map_merge:
           - {get_param: ServerMetadata}
-          - {get_param: {{role}}ServerMetadata}
+{%- if role.deprecated_param_metadata is defined %}
+          - {get_param: {{role.deprecated_param_metadata}}}
+{%- endif %}
+          - {get_param: {{role.name}}ServerMetadata}
           - {get_param: ServiceMetadataSettings}
-      scheduler_hints: {get_param: {{role}}SchedulerHints}
+      scheduler_hints: {get_param: {{role.name}}SchedulerHints}
       deployment_swift_data:
         if:
           - deployment_swift_data_map_unset
@@ -260,83 +354,39 @@ resources:
   # For optional operator role-specific userdata
   # Should return a OS::Heat::MultipartMime reference via OS::stack_id
   RoleUserData:
-    type: OS::TripleO::{{role}}::NodeUserData
+    type: OS::TripleO::{{role.name}}::NodeUserData
 
-  ExternalPort:
-    type: OS::TripleO::{{role}}::Ports::ExternalPort
+  {%- for network in networks %}
+  {{network.name}}Port:
+    type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port
     properties:
-      ControlPlaneIP: {get_attr: [{{role}}, networks, ctlplane, 0]}
-      IPPool: {get_param: {{role}}IPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  InternalApiPort:
-    type: OS::TripleO::{{role}}::Ports::InternalApiPort
-    properties:
-      ControlPlaneIP: {get_attr: [{{role}}, networks, ctlplane, 0]}
-      IPPool: {get_param: {{role}}IPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  StoragePort:
-    type: OS::TripleO::{{role}}::Ports::StoragePort
-    properties:
-      ControlPlaneIP: {get_attr: [{{role}}, networks, ctlplane, 0]}
-      IPPool: {get_param: {{role}}IPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  StorageMgmtPort:
-    type: OS::TripleO::{{role}}::Ports::StorageMgmtPort
-    properties:
-      ControlPlaneIP: {get_attr: [{{role}}, networks, ctlplane, 0]}
-      IPPool: {get_param: {{role}}IPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  TenantPort:
-    type: OS::TripleO::{{role}}::Ports::TenantPort
-    properties:
-      ControlPlaneIP: {get_attr: [{{role}}, networks, ctlplane, 0]}
-      IPPool: {get_param: {{role}}IPs}
-      NodeIndex: {get_param: NodeIndex}
-
-  ManagementPort:
-    type: OS::TripleO::{{role}}::Ports::ManagementPort
-    properties:
-      ControlPlaneIP: {get_attr: [{{role}}, networks, ctlplane, 0]}
-      IPPool: {get_param: {{role}}IPs}
+      ControlPlaneIP: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
+      IPPool:
+        map_merge:
+{%- if role.deprecated_param_ips is defined %}
+          - {get_param: {{role.deprecated_param_ips}}}
+{%- endif %}
+          - {get_param: {{role.name}}IPs}
       NodeIndex: {get_param: NodeIndex}
+  {%- endfor %}
 
   NetworkConfig:
-    type: OS::TripleO::{{role}}::Net::SoftwareConfig
+    type: OS::TripleO::{{role.name}}::Net::SoftwareConfig
     properties:
-      ControlPlaneIp: {get_attr: [{{role}}, networks, ctlplane, 0]}
-      ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
-      InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
-      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
-      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
-      TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
-      ManagementIpSubnet: {get_attr: [ManagementPort, ip_subnet]}
+      ControlPlaneIp: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
+  {%- for network in networks %}
+      {{network.name}}IpSubnet: {get_attr: [{{network.name}}Port, ip_subnet]}
+  {%- endfor %}
 
   NetIpMap:
     type: OS::TripleO::Network::Ports::NetIpMap
     properties:
-      ControlPlaneIp: {get_attr: [{{role}}, networks, ctlplane, 0]}
-      ExternalIp: {get_attr: [ExternalPort, ip_address]}
-      ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
-      ExternalIpUri: {get_attr: [ExternalPort, ip_address_uri]}
-      InternalApiIp: {get_attr: [InternalApiPort, ip_address]}
-      InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
-      InternalApiIpUri: {get_attr: [InternalApiPort, ip_address_uri]}
-      StorageIp: {get_attr: [StoragePort, ip_address]}
-      StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}
-      StorageIpUri: {get_attr: [StoragePort, ip_address_uri]}
-      StorageMgmtIp: {get_attr: [StorageMgmtPort, ip_address]}
-      StorageMgmtIpSubnet: {get_attr: [StorageMgmtPort, ip_subnet]}
-      StorageMgmtIpUri: {get_attr: [StorageMgmtPort, ip_address_uri]}
-      TenantIp: {get_attr: [TenantPort, ip_address]}
-      TenantIpSubnet: {get_attr: [TenantPort, ip_subnet]}
-      TenantIpUri: {get_attr: [TenantPort, ip_address_uri]}
-      ManagementIp: {get_attr: [ManagementPort, ip_address]}
-      ManagementIpSubnet: {get_attr: [ManagementPort, ip_subnet]}
-      ManagementIpUri: {get_attr: [ManagementPort, ip_address_uri]}
+      ControlPlaneIp: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
+  {%- for network in networks %}
+      {{network.name}}Ip: {get_attr: [{{network.name}}Port, ip_address]}
+      {{network.name}}IpSubnet: {get_attr: [{{network.name}}Port, ip_subnet]}
+      {{network.name}}IpUri: {get_attr: [{{network.name}}Port, ip_address_uri]}
+  {%- endfor %}
 
   NetHostMap:
     type: OS::Heat::Value
@@ -347,93 +397,102 @@ resources:
           fqdn:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - external
               - {get_param: CloudDomain}
           short:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - external
         internal_api:
           fqdn:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - internalapi
               - {get_param: CloudDomain}
           short:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - internalapi
         storage:
           fqdn:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - storage
               - {get_param: CloudDomain}
           short:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - storage
         storage_mgmt:
           fqdn:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - storagemgmt
               - {get_param: CloudDomain}
           short:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - storagemgmt
         tenant:
           fqdn:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - tenant
               - {get_param: CloudDomain}
           short:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - tenant
         management:
           fqdn:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - management
               - {get_param: CloudDomain}
           short:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - management
         ctlplane:
           fqdn:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - ctlplane
               - {get_param: CloudDomain}
           short:
             list_join:
             - '.'
-            - - {get_attr: [{{role}}, name]}
+            - - {get_attr: [{{server_resource_name}}, name]}
               - ctlplane
+        canonical:
+          fqdn:
+            list_join:
+            - '.'
+            - - {get_attr: [{{server_resource_name}}, name]}
+              - {get_param: CloudDomain}
+          short:
+            - {get_attr: [{{server_resource_name}}, name]}
 
   PreNetworkConfig:
-    type: OS::TripleO::{{role}}::PreNetworkConfig
+    type: OS::TripleO::{{role.name}}::PreNetworkConfig
     properties:
-      server: {get_resource: {{role}}}
+      server: {get_resource: {{server_resource_name}}}
       RoleParameters: {get_param: RoleParameters}
       ServiceNames: {get_param: ServiceNames}
+      deployment_actions: {get_attr: [DeploymentActions, value]}
 
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
@@ -441,7 +500,7 @@ resources:
     properties:
       name: NetworkDeployment
       config: {get_resource: NetworkConfig}
-      server: {get_resource: {{role}}}
+      server: {get_resource: {{server_resource_name}}}
       actions: {get_param: NetworkDeploymentActions}
       input_values:
         bridge_name: {get_param: NeutronPhysicalBridge}
@@ -449,10 +508,13 @@ resources:
       actions:
         if:
           - server_not_blacklisted
-          - {get_param: NetworkDeploymentActions}
+          - if:
+            - role_network_deployment_actions_exists
+            - {get_param: {{role.name}}NetworkDeploymentActions}
+            - {get_param: NetworkDeploymentActions}
           - []
 
-  {{role}}UpgradeInitConfig:
+  {{server_resource_name}}UpgradeInitConfig:
     type: OS::Heat::SoftwareConfig
     properties:
       group: script
@@ -466,26 +528,26 @@ resources:
 
   # Note we may be able to make this conditional on UpgradeInitCommandNotEmpty
   # but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first
-  {{role}}UpgradeInitDeployment:
+  {{server_resource_name}}UpgradeInitDeployment:
     type: OS::Heat::SoftwareDeployment
     depends_on: NetworkDeployment
     properties:
-      name: {{role}}UpgradeInitDeployment
-      server: {get_resource: {{role}}}
-      config: {get_resource: {{role}}UpgradeInitConfig}
+      name: {{server_resource_name}}UpgradeInitDeployment
+      server: {get_resource: {{server_resource_name}}}
+      config: {get_resource: {{server_resource_name}}UpgradeInitConfig}
       actions:
         if:
           - server_not_blacklisted
           - ['CREATE', 'UPDATE']
           - []
 
-  {{role}}Deployment:
+  {{server_resource_name}}Deployment:
     type: OS::Heat::StructuredDeployment
-    depends_on: {{role}}UpgradeInitDeployment
+    depends_on: {{server_resource_name}}UpgradeInitDeployment
     properties:
-      name: {{role}}Deployment
-      config: {get_resource: {{role}}Config}
-      server: {get_resource: {{role}}}
+      name: {{server_resource_name}}Deployment
+      config: {get_resource: {{server_resource_name}}Config}
+      server: {get_resource: {{server_resource_name}}}
       input_values:
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
       actions:
@@ -494,7 +556,7 @@ resources:
           - ['CREATE', 'UPDATE']
           - []
 
-  {{role}}Config:
+  {{server_resource_name}}Config:
     type: OS::Heat::StructuredConfig
     properties:
       group: hiera
@@ -503,27 +565,42 @@ resources:
           - '"%{::uuid}"'
           - heat_config_%{::deploy_config_name}
           - config_step
-          - {{role.lower()}}_extraconfig
+          - {{role.name.lower()}}_extraconfig
           - extraconfig
           - service_names
           - service_configs
-          - {{role.lower()}}
+          - {{role.name.lower()}}
           - bootstrap_node # provided by allNodesConfig
           - all_nodes # provided by allNodesConfig
           - vip_data # provided by allNodesConfig
+          - net_ip_map
           - '"%{::osfamily}"'
+          # The following are required for compatibility with the Controller role
+          # where some vendor integrations added hieradata via ExtraConfigPre
+          - neutron_bigswitch_data # Optionally provided by Controller/ComputeExtraConfigPre
+          - neutron_cisco_data # Optionally provided by Controller/ComputeExtraConfigPre
+          - cisco_n1kv_data # Optionally provided by Controller/ComputeExtraConfigPre
+          - midonet_data #Optionally provided by AllNodesExtraConfig
+          - cisco_aci_data # Optionally provided by Controller/ComputeExtraConfigPre
+          - common # Optionally provided by os-net-config
         merge_behavior: deeper
         datafiles:
           service_names:
             service_names: {get_param: ServiceNames}
             sensu::subscriptions: {get_param: MonitoringSubscriptions}
+          net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
           service_configs:
             map_replace:
               - {get_param: ServiceConfigSettings}
               - values: {get_attr: [NetIpMap, net_ip_map]}
-          {{role.lower()}}_extraconfig: {get_param: {{role}}ExtraConfig}
+          {{role.name.lower()}}_extraconfig:
+            map_merge:
+{%- if role.deprecated_param_extraconfig is defined %}
+              - {get_param: {{role.deprecated_param_extraconfig}}}
+{%- endif %}
+              - {get_param: {{server_resource_name}}ExtraConfig}
           extraconfig: {get_param: ExtraConfig}
-          {{role.lower()}}:
+          {{role.name.lower()}}:
             tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
             tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: LoggingSources}
             tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: LoggingGroups}
@@ -534,28 +611,51 @@ resources:
             fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]}
             fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
             fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]}
+            fqdn_canonical: {get_attr: [NetHostMap, value, canonical, fqdn]}
 
   # Resource for site-specific injection of root certificate
   NodeTLSCAData:
-    depends_on: {{role}}Deployment
+    depends_on: NetworkDeployment
     type: OS::TripleO::NodeTLSCAData
     properties:
-      server: {get_resource: {{role}}}
+      server: {get_resource: {{server_resource_name}}}
+
+  {%- if 'primary' in role.tags and 'controller' in role.tags %}
+  # Resource for site-specific passing of private keys/certificates
+  NodeTLSData:
+    depends_on: NodeTLSCAData
+    type: OS::TripleO::NodeTLSData
+    properties:
+      server: {get_resource: {{server_resource_name}}}
+      NodeIndex: {get_param: NodeIndex}
+  {%- endif -%}
 
   # Hook for site-specific additional pre-deployment config, e.g extra hieradata
-  {{role}}ExtraConfigPre:
-    depends_on: {{role}}Deployment
-    type: OS::TripleO::{{role}}ExtraConfigPre
+  {{role.name}}ExtraConfigPre:
+    depends_on: {{server_resource_name}}Deployment
+    type: OS::TripleO::{{role.name}}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}}}
+        server: {get_resource: {{server_resource_name}}}
 
   # Hook for site-specific additional pre-deployment config,
   # applying to all nodes, e.g node registration/unregistration
   NodeExtraConfig:
-    depends_on: [{{role}}ExtraConfigPre, NodeTLSCAData]
+    depends_on:
+      - {{role.name}}ExtraConfigPre
+  {%- if 'primary' in role.tags and 'controller' in role.tags %}
+      - NodeTLSData
+  {%- else %}
+      - NodeTLSCAData
+  {%- endif %}
     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}}}
+        server: {get_resource: {{server_resource_name}}}
 
   UpdateConfig:
     type: OS::TripleO::Tasks::PackageUpdate
@@ -566,7 +666,7 @@ resources:
     properties:
       name: UpdateDeployment
       config: {get_resource: UpdateConfig}
-      server: {get_resource: {{role}}}
+      server: {get_resource: {{server_resource_name}}}
       input_values:
         update_identifier:
           get_param: UpdateIdentifier
@@ -576,113 +676,133 @@ 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
+    depends_on: {{server_resource_name}}Deployment
     properties:
-        server: {get_resource: {{role}}}
+        server: {get_resource: {{server_resource_name}}}
+        deployment_actions: {get_attr: [DeploymentActions, value]}
 
 outputs:
   ip_address:
     description: IP address of the server in the ctlplane network
-    value: {get_attr: [{{role}}, networks, ctlplane, 0]}
+    value: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
   hostname:
     description: Hostname of the server
-    value: {get_attr: [{{role}}, name]}
+    value: {get_attr: [{{server_resource_name}}, name]}
   hostname_map:
     description: Mapping of network names to hostnames
     value:
-      external: {get_attr: [NetHostMap, value, external, fqdn]}
-      internal_api: {get_attr: [NetHostMap, value, internal_api, fqdn]}
-      storage: {get_attr: [NetHostMap, value, storage, fqdn]}
-      storage_mgmt: {get_attr: [NetHostMap, value, storage_mgmt, fqdn]}
-      tenant: {get_attr: [NetHostMap, value, tenant, fqdn]}
-      management: {get_attr: [NetHostMap, value, management, fqdn]}
+  {%- for network in networks %}
+      {{network.name_lower|default(network.name.lower())}}: {get_attr: [NetHostMap, value, {{network.name_lower|default(network.name.lower()) }}, fqdn]}
+  {%- endfor %}
       ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]}
+      canonical: {get_attr: [NetHostMap, value, canonical, fqdn]}
   hosts_entry:
     value:
       str_replace:
         template: |
           PRIMARYIP PRIMARYHOST.DOMAIN PRIMARYHOST
-          EXTERNALIP EXTERNALHOST.DOMAIN EXTERNALHOST
-          INTERNAL_APIIP INTERNAL_APIHOST.DOMAIN INTERNAL_APIHOST
-          STORAGEIP STORAGEHOST.DOMAIN STORAGEHOST
-          STORAGE_MGMTIP STORAGE_MGMTHOST.DOMAIN STORAGE_MGMTHOST
-          TENANTIP TENANTHOST.DOMAIN TENANTHOST
-          MANAGEMENTIP MANAGEMENTHOST.DOMAIN MANAGEMENTHOST
+  {%- for network in networks %}
+          {{network.name}}IP {{network.name}}HOST.DOMAIN {{network.name}}HOST
+  {%- endfor %}
           CTLPLANEIP CTLPLANEHOST.DOMAIN CTLPLANEHOST
         params:
-          PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, {{role}}HostnameResolveNetwork]}]}
+          PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, {{role.name}}HostnameResolveNetwork]}]}
           DOMAIN: {get_param: CloudDomain}
-          PRIMARYHOST: {get_attr: [{{role}}, name]}
-          EXTERNALIP: {get_attr: [ExternalPort, ip_address]}
-          EXTERNALHOST: {get_attr: [NetHostMap, value, external, short]}
-          INTERNAL_APIIP: {get_attr: [InternalApiPort, ip_address]}
-          INTERNAL_APIHOST: {get_attr: [NetHostMap, value, internal_api, short]}
-          STORAGEIP: {get_attr: [StoragePort, ip_address]}
-          STORAGEHOST: {get_attr: [NetHostMap, value, storage, short]}
-          STORAGE_MGMTIP: {get_attr: [StorageMgmtPort, ip_address]}
-          STORAGE_MGMTHOST: {get_attr: [NetHostMap, value, storage_mgmt, short]}
-          TENANTIP: {get_attr: [TenantPort, ip_address]}
-          TENANTHOST: {get_attr: [NetHostMap, value, tenant, short]}
-          MANAGEMENTIP: {get_attr: [ManagementPort, ip_address]}
-          MANAGEMENTHOST: {get_attr: [NetHostMap, value, management, short]}
-          CTLPLANEIP: {get_attr: [{{role}}, networks, ctlplane, 0]}
+          PRIMARYHOST: {get_attr: [{{server_resource_name}}, name]}
+  {%- for network in networks %}
+          {{network.name}}IP: {get_attr: [{{network.name}}Port, ip_address]}
+          {{network.name}}HOST: {get_attr: [NetHostMap, value, {{network.name_lower|default(network.name.lower())}}, short]}
+  {%- endfor %}
+          CTLPLANEIP: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
           CTLPLANEHOST: {get_attr: [NetHostMap, value, ctlplane, short]}
   known_hosts_entry:
     description: Entry for ssh known hosts
     value:
       str_replace:
         template: "PRIMARYIP,PRIMARYHOST.DOMAIN,PRIMARYHOST,\
-EXTERNALIP,EXTERNALHOST.DOMAIN,EXTERNALHOST,\
-INTERNAL_APIIP,INTERNAL_APIHOST.DOMAIN,INTERNAL_APIHOST,\
-STORAGEIP,STORAGEHOST.DOMAIN,STORAGEHOST,\
-STORAGE_MGMTIP,STORAGE_MGMTHOST.DOMAIN,STORAGE_MGMTHOST,\
-TENANTIP,TENANTHOST.DOMAIN,TENANTHOST,\
-MANAGEMENTIP,MANAGEMENTHOST.DOMAIN,MANAGEMENTHOST,\
+  {%- for network in networks %}
+{{network.name}}IP,{{network.name}}HOST.DOMAIN,{{network.name}}HOST,\
+  {%- endfor %}
 CTLPLANEIP,CTLPLANEHOST.DOMAIN,CTLPLANEHOST HOSTSSHPUBKEY"
         params:
-          PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, {{role}}HostnameResolveNetwork]}]}
+          PRIMARYIP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, {{role.name}}HostnameResolveNetwork]}]}
           DOMAIN: {get_param: CloudDomain}
-          PRIMARYHOST: {get_attr: [{{role}}, name]}
-          EXTERNALIP: {get_attr: [ExternalPort, ip_address]}
-          EXTERNALHOST: {get_attr: [NetHostMap, value, external, short]}
-          INTERNAL_APIIP: {get_attr: [InternalApiPort, ip_address]}
-          INTERNAL_APIHOST: {get_attr: [NetHostMap, value, internal_api, short]}
-          STORAGEIP: {get_attr: [StoragePort, ip_address]}
-          STORAGEHOST: {get_attr: [NetHostMap, value, storage, short]}
-          STORAGE_MGMTIP: {get_attr: [StorageMgmtPort, ip_address]}
-          STORAGE_MGMTHOST: {get_attr: [NetHostMap, value, storage_mgmt, short]}
-          TENANTIP: {get_attr: [TenantPort, ip_address]}
-          TENANTHOST: {get_attr: [NetHostMap, value, tenant, short]}
-          MANAGEMENTIP: {get_attr: [ManagementPort, ip_address]}
-          MANAGEMENTHOST: {get_attr: [NetHostMap, value, management, short]}
-          CTLPLANEIP: {get_attr: [{{role}}, networks, ctlplane, 0]}
+          PRIMARYHOST: {get_attr: [{{server_resource_name}}, name]}
+  {%- for network in networks %}
+          {{network.name}}IP: {get_attr: [{{network.name}}Port, ip_address]}
+          {{network.name}}HOST: {get_attr: [NetHostMap, value, {{network.name_lower|default(network.name.lower())}}, short]}
+  {%- endfor %}
+          CTLPLANEIP: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
           CTLPLANEHOST: {get_attr: [NetHostMap, value, ctlplane, short]}
           HOSTSSHPUBKEY: {get_attr: [SshHostPubKey, ecdsa]}
   nova_server_resource:
-    description: Heat resource handle for {{role}} server
+    description: Heat resource handle for {{role.name}} server
     value:
-      {get_resource: {{role}}}
+      {get_resource: {{server_resource_name}}}
     condition: server_not_blacklisted
-  external_ip_address:
-    description: IP address of the server in the external network
-    value: {get_attr: [ExternalPort, ip_address]}
-  internal_api_ip_address:
-    description: IP address of the server in the internal_api network
-    value: {get_attr: [InternalApiPort, ip_address]}
-  storage_ip_address:
-    description: IP address of the server in the storage network
-    value: {get_attr: [StoragePort, ip_address]}
-  storage_mgmt_ip_address:
-    description: IP address of the server in the storage_mgmt network
-    value: {get_attr: [StorageMgmtPort, ip_address]}
-  tenant_ip_address:
-    description: IP address of the server in the tenant network
-    value: {get_attr: [TenantPort, ip_address]}
-  management_ip_address:
-    description: IP address of the server in the management network
-    value: {get_attr: [ManagementPort, ip_address]}
+  deployed_server_port_map:
+    description: |
+      Map of Heat created hostname of the server to ip address. This is the
+      hostname before it has been mapped with the HostnameMap parameter, and
+      the IP address from the ctlplane network. This map can be used to construct
+      the DeployedServerPortMap parameter when using split-stack.
+    value:
+      map_replace:
+        - hostname:
+            fixed_ips:
+              - ip_address: {get_attr: [{{server_resource_name}}, networks, ctlplane, 0]}
+        - keys:
+            hostname:
+              list_join:
+                - '-'
+                - - {get_param: Hostname}
+                  - ctlplane
+  deployed_server_deployment_swift_data_map:
+    description:
+      Map of Heat created hostname of the server to the Swift container and object
+      used to created the temporary url for metadata polling with
+      os-collect-config.
+    value:
+      map_replace:
+        - hostname:
+            container:
+              str_split:
+                - '/'
+                - {get_attr: [{{server_resource_name}}, os_collect_config, request, metadata_url]}
+                - 5
+            object:
+              str_split:
+                - '?'
+                - str_split:
+                    - '/'
+                    - {get_attr: [{{server_resource_name}}, os_collect_config, request, metadata_url]}
+                    - 6
+                - 0
+        - keys: {hostname: {get_param: Hostname}}
+  {%- if 'primary' in role.tags and 'controller' in role.tags %}
+  tls_key_modulus_md5:
+    description: MD5 checksum of the TLS Key Modulus
+    value: {get_attr: [NodeTLSData, key_modulus_md5]}
+  tls_cert_modulus_md5:
+    description: MD5 checksum of the TLS Certificate Modulus
+    value: {get_attr: [NodeTLSData, cert_modulus_md5]}
+  {%- endif %}
   os_collect_config:
     description: The os-collect-config configuration associated with this server resource
-    value: {get_attr: [{{role}}, os_collect_config]}
+    value: {get_attr: [{{server_resource_name}}, os_collect_config]}
+  {%- for network in networks %}
+  {{network.name_lower|default(network.name.lower())}}_ip_address:
+    description: IP address of the server in the {{network.name}} network
+    value: {get_attr: [{{network.name}}Port, ip_address]}
+  {%- endfor %}