Merge "Restore rabbit.host and add an haproxy rabbit listener"
[apex-tripleo-heat-templates.git] / overcloud-source.yaml
index bba161e..6449f8d 100644 (file)
-Description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
+description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
   server,Dedicated RabbitMQ Server,Group of Nova Computes
-HeatTemplateFormatVersion: '2012-12-12'
-Parameters:
+heat_template_version: 2014-10-16
+parameters:
   AdminPassword:
-    Default: unset
-    Description: The password for the keystone admin account, used for monitoring, querying neutron etc.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: The password for the keystone admin account, used for monitoring, querying neutron etc.
+    type: string
+    hidden: true
   AdminToken:
-    Default: unset
-    Description: The keystone auth secret.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: The keystone auth secret.
+    type: string
+    hidden: true
   CinderPassword:
-    Default: unset
-    Description: The password for the cinder service account, used by cinder-api.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: The password for the cinder service account, used by cinder-api.
+    type: string
+    hidden: true
+  CinderISCSIHelper:
+    default: tgtadm
+    description: The iSCSI helper to use with cinder.
+    type: string
+  CinderLVMLoopDeviceSize:
+    default: 5000
+    description: The size of the loopback file used by the cinder LVM driver.
+    type: number
+  ExtraConfig:
+    default: {}
+    description: |
+      Additional configuration to inject into the cluster. The JSON should have
+      the following structure:
+        {"FILEKEY":
+          {"config":
+            [{"section": "SECTIONNAME",
+              "values":
+                [{"option": "OPTIONNAME",
+                  "value": "VALUENAME"
+                 }
+                ]
+             }
+            ]
+          }
+        }
+      For instance:
+        {"nova":
+          {"config":
+            [{"section": "default",
+              "values":
+                [{"option": "compute_manager",
+                  "value": "ironic.nova.compute.manager.ClusterComputeManager"
+                 }
+                ]
+             },
+             {"section": "cells",
+              "values":
+                [{"option": "driver",
+                  "value": "nova.cells.rpc_driver.CellsRPCDriver"
+                 }
+                ]
+             }
+            ]
+          }
+        }
+    type: json
   OvercloudControlFlavor:
-    Default: baremetal
-    Description: Flavor for control nodes to request when deploying.
-    Type: String
+    default: baremetal
+    description: Flavor for control nodes to request when deploying.
+    type: string
   OvercloudComputeFlavor:
-    Default: baremetal
-    Description: Flavor for compute nodes to request when deploying.
-    Type: String
+    default: baremetal
+    description: Flavor for compute nodes to request when deploying.
+    type: string
+  GlancePort:
+    default: 9292
+    description: Glance port.
+    type: string
+  GlanceProtocol:
+    default: http
+    description: Protocol to use when connecting to glance, set to https for SSL.
+    type: string
   GlancePassword:
-    Default: unset
-    Description: The password for the glance service account, used by the glance services.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: The password for the glance service account, used by the glance services.
+    type: string
+    hidden: true
   GlanceNotifierStrategy:
-    Description: Strategy to use for Glance notification queue
-    Type: String
-    Default: noop
+    description: Strategy to use for Glance notification queue
+    type: string
+    default: noop
   GlanceLogFile:
-    Description: The filepath of the file to use for logging messages from Glance.
-    Type: String
-    Default: ''
+    description: The filepath of the file to use for logging messages from Glance.
+    type: string
+    default: ''
   HeatPassword:
-    Default: unset
-    Description: The password for the Heat service account, used by the Heat services.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: The password for the Heat service account, used by the Heat services.
+    type: string
+    hidden: true
   ImageUpdatePolicy:
-    Default: 'REPLACE'
-    Description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
-    Type: String
+    default: 'REBUILD_PRESERVE_EPHEMERAL'
+    description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
+    type: string
   KeyName:
-    Default: default
-    Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
-    Type: String
+    default: default
+    description: Name of an existing EC2 KeyPair to enable SSH access to the instances
+    type: string
   NeutronBridgeMappings:
-    Description: The OVS logical->physical bridge mappings to use.
-    Type: String
-    Default: ''
+    description: The OVS logical->physical bridge mappings to use.
+    type: string
+    default: ''
   NeutronPassword:
-    Default: unset
-    Description: The password for the neutron service account, used by neutron agents.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: The password for the neutron service account, used by neutron agents.
+    type: string
+    hidden: true
   CeilometerComputeAgent:
-    Description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
-    Type: String
-    Default: ''
-    AllowedValues: ['', Present]
+    description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
+    type: string
+    default: ''
+    constraints:
+    - allowed_values: ['', Present]
   CeilometerMeteringSecret:
-    Default: unset
-    Description: Secret shared by the ceilometer services.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: Secret shared by the ceilometer services.
+    type: string
+    hidden: true
   CeilometerPassword:
-    Default: unset
-    Description: The password for the ceilometer service account.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: The password for the ceilometer service account.
+    type: string
+    hidden: true
+  SnmpdReadonlyUserName:
+    default: ro_snmp_user
+    description: The user name for SNMPd with readonly rights running on all Overcloud nodes
+    type: string
+  SnmpdReadonlyUserPassword:
+    default: unset
+    description: The user password for SNMPd with readonly rights running on all Overcloud nodes
+    type: string
+    hidden: true
   CloudName:
-    Default: ''
-    Description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
-    Type: String
+    default: ''
+    description: The DNS name of this cloud. E.g. ci-overcloud.tripleo.org
+    type: string
   NovaComputeDriver:
-    Default: libvirt.LibvirtDriver
-    Type: String
+    default: libvirt.LibvirtDriver
+    type: string
   NovaComputeLibvirtType:
-    Default: ''
-    Type: String
+    default: ''
+    type: string
   NovaImage:
-    Type: String
-    Default: overcloud-compute
+    type: string
+    default: overcloud-compute
   NovaPassword:
-    Default: unset
-    Description: The password for the nova service account, used by nova-api.
-    Type: String
-    NoEcho: true
+    default: unset
+    description: The password for the nova service account, used by nova-api.
+    type: string
+    hidden: true
   NeutronFlatNetworks:
-    Type: String
-    Default: ''
-    Description: If set, flat networks to configure in neutron plugins.
+    type: string
+    default: ''
+    description: If set, flat networks to configure in neutron plugins.
   HypervisorNeutronPhysicalBridge:
-    Default: ''
-    Description: An OVS bridge to create on each hypervisor.
-    Type: String
+    default: ''
+    description: An OVS bridge to create on each hypervisor.
+    type: string
   HypervisorNeutronPublicInterface:
-    Default: ''
-    Description: What interface to add to the HypervisorNeutronPhysicalBridge.
-    Type: String
+    default: ''
+    description: What interface to add to the HypervisorNeutronPhysicalBridge.
+    type: string
   NeutronPublicInterface:
-    Default: eth0
-    Description: What interface to bridge onto br-ex for network nodes.
-    Type: String
+    default: eth0
+    description: What interface to bridge onto br-ex for network nodes.
+    type: string
   NeutronPublicInterfaceDefaultRoute:
-    Default: ''
-    Description: A custom default route for the NeutronPublicInterface.
-    Type: String
+    default: ''
+    description: A custom default route for the NeutronPublicInterface.
+    type: string
   NeutronPublicInterfaceIP:
-    Default: ''
-    Description: A custom IP address to put onto the NeutronPublicInterface.
-    Type: String
+    default: ''
+    description: A custom IP address to put onto the NeutronPublicInterface.
+    type: string
   NeutronPublicInterfaceRawDevice:
-    Default: ''
-    Description: If set, the public interface is a vlan with this device as the raw device.
-    Type: String
-  notcomputeImage:
-    Type: String
-    Default: overcloud-control
+    default: ''
+    description: If set, the public interface is a vlan with this device as the raw device.
+    type: string
+  NeutronControlPlaneID:
+    default: ''
+    type: string
+    description: Neutron ID for ctlplane network.
+  NeutronDnsmasqOptions:
+    default: 'dhcp-option-force=26,1400'
+    description: Dnsmasq options for neutron-dhcp-agent. The default value here forces MTU to be set to 1400 to account for the gre tunnel overhead.
+    type: string
+  controllerImage:
+    type: string
+    default: overcloud-control
   NtpServer:
-    Type: String
-    Default: ''
+    type: string
+    default: ''
   RabbitUserName:
-    Default: guest
-    Description: The username for RabbitMQ
-    Type: String
+    default: guest
+    description: The username for RabbitMQ
+    type: string
   RabbitPassword:
-    Default: guest
-    Description: The password for RabbitMQ
-    Type: String
-    NoEcho: true
+    default: guest
+    description: The password for RabbitMQ
+    type: string
+    hidden: true
   RabbitCookieSalt:
-    Type: String
-    Default: unset
-    Description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
+    type: string
+    default: unset
+    description: Salt for the rabbit cookie, change this to force the randomly generated rabbit cookie to change.
   HeatStackDomainAdminPassword:
-    Description: Password for heat_domain_admin user.
-    Type: String
-    Default: ''
-    NoEcho: true
+    description: Password for heat_domain_admin user.
+    type: string
+    default: ''
+    hidden: true
   LiveUpdateUserName:
-    Type: String
-    Description: The live-update username for the undercloud Glance API.
-    Default: ''
+    type: string
+    description: The live-update username for the undercloud Glance API.
+    default: ''
   LiveUpdateTenantName:
-    Type: String
-    Description: The live-update tenant name for the undercloud Glance API.
-    Default: ''
+    type: string
+    description: The live-update tenant name for the undercloud Glance API.
+    default: ''
   LiveUpdateHost:
-    Type: String
-    Description: The IP address for the undercloud Glance API.
-    Default: ''
+    type: string
+    description: The IP address for the undercloud Glance API.
+    default: ''
   LiveUpdatePassword:
-    Type: String
-    Default: ''
-    Description: The live-update password for the undercloud Glance API.
-    NoEcho: true
+    type: string
+    default: ''
+    description: The live-update password for the undercloud Glance API.
+    hidden: true
   LiveUpdateComputeImage:
-    Type: String
-    Description: The image ID for live-updates to the overcloud compute nodes.
-    Default: ''
-Resources:
+    type: string
+    description: The image ID for live-updates to the overcloud compute nodes.
+    default: ''
+  MysqlInnodbBufferPoolSize:
+    description: >
+        Specifies the size of the buffer pool in megabytes. Setting to
+        zero should be interpreted as "no value" and will defer to the
+        lower level default.
+    type: number
+    default: 0
+  ControlVirtualInterface:
+    default: 'br-ex'
+    description: Interface where virtual ip will be assigned.
+    type: string
+  ControlFixedIPs:
+    default: []
+    description: Should be used for arbitrary ips.
+    type: json
+  PublicVirtualFixedIPs:
+    default: []
+    description: |
+        Control the IP allocation for the PublicVirtualInterface port. E.g.
+        [{'ip_address':'1.2.3.4'}]
+    type: json
+  PublicVirtualInterface:
+    default: 'br-ex'
+    description: >
+        Specifies the interface where the public-facing virtual ip will be assigned.
+        This should be int_public when a VLAN is being used.
+    type: string
+  PublicVirtualNetwork:
+    default: 'ctlplane'
+    type: string
+    description: >
+        Neutron network to allocate public virtual IP port on.
+  KeystoneCACertificate:
+    default: ''
+    description: Keystone self-signed certificate authority certificate.
+    type: string
+  KeystoneSigningCertificate:
+    default: ''
+    description: Keystone certificate for verifying token validity.
+    type: string
+  KeystoneSigningKey:
+    default: ''
+    description: Keystone key for signing tokens.
+    type: string
+    hidden: true
+resources:
+  ControlVirtualIP:
+    type: OS::Neutron::Port
+    properties:
+      name: control_virtual_ip
+      network_id: {get_param: NeutronControlPlaneID}
+      fixed_ips:
+        get_param: ControlFixedIPs
+  MysqlClusterUniquePart:
+    type: OS::Heat::RandomString
+    properties:
+      length: 10
+  PublicVirtualIP:
+    type: OS::Neutron::Port
+    properties:
+      name: public_virtual_ip
+      network: {get_param: PublicVirtualNetwork}
+      fixed_ips:
+        get_param: PublicVirtualFixedIPs
   RabbitCookie:
-    Type: OS::Heat::RandomString
-    Properties:
+    type: OS::Heat::RandomString
+    properties:
       length: 20
       salt:
-        Ref: RabbitCookieSalt
-  AccessPolicy:
-    Properties:
-      AllowedResources:
-      - notCompute0
-      - notCompute0Config
-    Type: OS::Heat::AccessPolicy
-  ComputeAccessPolicy:
-    Properties:
-      AllowedResources:
-      - NovaCompute0
-      - NovaCompute0Config
-    Type: OS::Heat::AccessPolicy
-  notCompute0Key:
-    Properties:
-      UserName:
-        Ref: User
-    Type: AWS::IAM::AccessKey
-  notCompute0CompletionCondition:
-    Type: AWS::CloudFormation::WaitCondition
-    DependsOn: notCompute0Config
-    Properties:
-      Handle: {Ref: notCompute0CompletionHandle}
-      Count: '1'
-      Timeout: '1800'
-  notCompute0CompletionHandle:
-    Type: OS::Heat::UpdateWaitConditionHandle
-  NovaCompute0Key:
-    Type: FileInclude
+        get_param: RabbitCookieSalt
+  NovaCompute0Deploy:
+    type: FileInclude
     Path: nova-compute-instance.yaml
-    SubKey: Resources.NovaCompute0Key
-  NovaCompute0CompletionCondition:
-    Type: FileInclude
-    Path: nova-compute-instance.yaml
-    SubKey: Resources.NovaCompute0CompletionCondition
-  NovaCompute0CompletionHandle:
-    Type: FileInclude
-    Path: nova-compute-instance.yaml
-    SubKey: Resources.NovaCompute0CompletionHandle
-  ComputeUser:
-    Properties:
-      Policies:
-      - Ref: ComputeAccessPolicy
-    Type: AWS::IAM::User
-  NovaCompute0Config:
-    Type: FileInclude
-    Path: nova-compute-instance.yaml
-    SubKey: Resources.NovaCompute0Config
-    Parameters:
-        NovaApiHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-        KeystoneHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-        RabbitHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-        NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-        GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-        NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/nova']]}
-        CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/ceilometer']]}
-        NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ]}, '/neutron']]}
+    SubKey: resources.NovaCompute0Deploy
+    parameters:
+        NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+        KeystoneHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+        NeutronHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+        GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+        RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+        NovaDSN: {list_join: ['', ['mysql://nova:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/nova']]}
+        CeilometerDSN: {list_join: ['', ['mysql://ceilometer:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/ceilometer']]}
+        NeutronDSN: {list_join: ['', ['mysql://neutron:unset@', {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}, '/ovs_neutron']]}
         NeutronNetworkType: "gre"
         NeutronEnableTunnelling: "True"
         NeutronFlatNetworks:
-            Ref: NeutronFlatNetworks
+            get_param: NeutronFlatNetworks
         NeutronNetworkVLANRanges: ""
         NeutronPhysicalBridge:
-            Ref: HypervisorNeutronPhysicalBridge
+            get_param: HypervisorNeutronPhysicalBridge
         NeutronPublicInterface:
-            Ref: HypervisorNeutronPublicInterface
+            get_param: HypervisorNeutronPublicInterface
         NeutronBridgeMappings:
-            Ref: NeutronBridgeMappings
-        StaticHosts:
-          Fn::Join:
-          - "\n"
-          - - Fn::Join:
-              - "\n"
-              - Merge::Map:
-                  NovaCompute0:
-                    Fn::Join:
-                    - ' '
-                    - - Fn::Select:
-                        - 0
-                        - Fn::Select:
-                          - ctlplane
-                          - Fn::GetAtt:
-                            - NovaCompute0
-                            - networks
-                      - Fn::Select:
-                        - name
-                        - Fn::GetAtt:
-                          - NovaCompute0
-                          - show
-                      - Fn::Join:
-                        - '.'
-                        - - Fn::Select:
-                            - name
-                            - Fn::GetAtt:
-                              - NovaCompute0
-                              - show
-                          - 'novalocal'
-            - Fn::Join:
-              - ' '
-              - - Fn::Select:
-                  - 0
-                  - Fn::Select:
-                    - ctlplane
-                    - Fn::GetAtt:
-                      - notCompute0
-                      - networks
-                - {Ref: CloudName}
-                # If CloudName is unset, make the hosts line still valid
-                - unused
+            get_param: NeutronBridgeMappings
+  NovaCompute0AllNodes:
+    type: FileInclude
+    Path: nova-compute-instance.yaml
+    SubKey: resources.NovaCompute0AllNodesDeploy
+    parameters:
+        AllNodesConfig: {get_resource: allNodesConfig}
+  NovaCompute0Passthrough:
+    type: FileInclude
+    Path: nova-compute-instance.yaml
+    SubKey: resources.NovaCompute0Passthrough
+    parameters:
+        passthrough_config: {get_param: ExtraConfig}
   NovaCompute0:
-    Type: FileInclude
+    type: FileInclude
     Path: nova-compute-instance.yaml
-    SubKey: Resources.NovaCompute0
-  User:
-    Properties:
-      Policies:
-      - Ref: AccessPolicy
-    Type: AWS::IAM::User
-  notCompute0Config:
-    Type: AWS::AutoScaling::LaunchConfiguration
-    Properties:
-      ImageId: '0'
-      InstanceType: '0'
-    Metadata:
-      OpenStack::Heat::Stack: {}
-      OpenStack::ImageBuilder::Elements:
-      - boot-stack
-      - heat-cfntools
-      - heat-localip
-      - neutron-network-node
-      admin-password:
-        Ref: AdminPassword
-      admin-token:
-        Ref: AdminToken
-      bootstack:
-        public_interface_ip:
-          Ref: NeutronPublicInterfaceIP
-      cinder:
-        db: mysql://cinder:unset@localhost/cinder
-        volume_size_mb: '5000'
-        service-password:
-          Ref: CinderPassword
-      completion-handle:
-        Ref: notCompute0CompletionHandle
-      controller-address:
-        Fn::Select:
-         - 0
-         - Fn::Select:
-             - 'ctlplane'
-             - Fn::GetAtt:
-               - notCompute0
-               - networks
-      db-password: unset
-      glance:
-        backend: swift
-        db: mysql://glance:unset@localhost/glance
-        host:
-          Fn::Select:
-           - 0
-           - Fn::Select:
-               - 'ctlplane'
-               - Fn::GetAtt:
-                 - notCompute0
-                 - networks
-        service-password:
-          Ref: GlancePassword
-        swift-store-user: service:glance
-        swift-store-key:
-          Ref: GlancePassword
-        notifier-strategy:
-          Ref: GlanceNotifierStrategy
-        log-file:
-          Ref: GlanceLogFile
-      heat:
-        admin_password:
-          Ref: HeatPassword
-        admin_tenant_name: service
-        admin_user: heat
-        auth_encryption_key: unset___________
-        db: mysql://heat:unset@localhost/heat
-        stack_domain_admin_password: {Ref: HeatStackDomainAdminPassword}
-        watch_server_url:
-          Fn::Join:
+    SubKey: resources.NovaCompute0
+  controllerConfig:
+    type: OS::Heat::StructuredConfig
+    properties:
+      group: os-apply-config
+      config:
+        admin-password:
+          get_param: AdminPassword
+        admin-token:
+          get_param: AdminToken
+        bootstack:
+          public_interface_ip:
+            get_param: NeutronPublicInterfaceIP
+        bootstrap_host:
+          bootstrap_nodeid:
+            Fn::Select:
+            - 0
+            - Fn::Select:
+              - 0
+              - Merge::Map:
+                  controller0:
+                  - Fn::Select:
+                    - name
+                    - get_attr:
+                      - controller0
+                      - show
+          nodeid: {get_input: bootstack_nodeid}
+        cinder:
+          db: mysql://cinder:unset@localhost/cinder
+          volume_size_mb:
+            get_param: CinderLVMLoopDeviceSize
+          service-password:
+            get_param: CinderPassword
+          iscsi-helper:
+            get_param: CinderISCSIHelper
+        controller-address:
+          get_input: controller_host
+        corosync:
+          bindnetaddr: {get_input: controller_host}
+          mcastport: 5577
+          nodes:
+            Merge::Map:
+              controller0:
+                ip: {get_attr: [controller0, networks, ctlplane, 0]}
+        pacemaker:
+          stonith_enabled : false
+          recheck_interval : 5
+          quorum_policy : ignore
+        db-password: unset
+        glance:
+          registry:
+            host: {get_input: controller_virtual_ip}
+          backend: swift
+          db: mysql://glance:unset@localhost/glance
+          host:
+            get_input: controller_virtual_ip
+          port:
+            get_param: GlancePort
+          protocol:
+            get_param: GlanceProtocol
+          service-password:
+            get_param: GlancePassword
+          swift-store-user: service:glance
+          swift-store-key:
+            get_param: GlancePassword
+          notifier-strategy:
+            get_param: GlanceNotifierStrategy
+          log-file:
+            get_param: GlanceLogFile
+        heat:
+          admin_password:
+            get_param: HeatPassword
+          admin_tenant_name: service
+          admin_user: heat
+          auth_encryption_key: unset___________
+          db: mysql://heat:unset@localhost/heat
+          stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword}
+          watch_server_url: {get_input: heat.watch_server_url}
+          metadata_server_url: {get_input: heat.metadata_server_url}
+          waitcondition_server_url: {get_input: heat.waitcondition_server_url}
+        horizon:
+          caches:
+            memcached:
+              nodes:
+                Merge::Map:
+                  controller0:
+                    {get_attr: [controller0, show, name]}
+        keystone:
+          db: mysql://keystone:unset@localhost/keystone
+          host:
+            get_input: controller_virtual_ip
+          ca_certificate: {get_param: KeystoneCACertificate}
+          signing_key: {get_param: KeystoneSigningKey}
+          signing_certificate: {get_param: KeystoneSigningCertificate}
+        mysql:
+          innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
+          nodes:
+            Merge::Map:
+              controller0:
+                ip: {get_attr: [controller0, networks, ctlplane, 0]}
+          cluster_name:
+            list_join:
+              - '-'
+              - - 'tripleo'
+                - {get_resource: MysqlClusterUniquePart}
+        neutron:
+          flat-networks: {get_param: NeutronFlatNetworks}
+          host: {get_input: controller_virtual_ip}
+          metadata_proxy_shared_secret: unset
+          ovs:
+            enable_tunneling: 'True'
+            local_ip:
+              get_input: controller_host
+            bridge_mappings: {get_param: NeutronBridgeMappings}
+            public_interface:
+              get_param: NeutronPublicInterface
+            public_interface_raw_device:
+              get_param: NeutronPublicInterfaceRawDevice
+            public_interface_route:
+              get_param: NeutronPublicInterfaceDefaultRoute
+            physical_bridge: br-ex
+            tenant_network_type: gre
+          ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
+          service-password:
+            get_param: NeutronPassword
+          dnsmasq-options:
+            get_param: NeutronDnsmasqOptions
+        ceilometer:
+          db: mysql://ceilometer:unset@localhost/ceilometer
+          metering_secret: {get_param: CeilometerMeteringSecret}
+          service-password:
+            get_param: CeilometerPassword
+        snmpd:
+          export_MIB: UCD-SNMP-MIB
+          readonly_user_name:
+            get_param: SnmpdReadonlyUserName
+          readonly_user_password:
+            get_param: SnmpdReadonlyUserPassword
+        nova:
+          compute_driver: libvirt.LibvirtDriver
+          db: mysql://nova:unset@localhost/nova
+          default_floating_pool:
+            ext-net
+          host: {get_input: controller_virtual_ip}
+          metadata-proxy: true
+          service-password:
+            get_param: NovaPassword
+        rabbit:
+          host: {get_input: controller_virtual_ip}
+          username:
+            get_param: RabbitUserName
+          password:
+            get_param: RabbitPassword
+          cookie:
+            get_attr:
+            - RabbitCookie
+            - value
+        ntp:
+          servers:
+              - {server: {get_param: NtpServer}, fudge: "stratum 0"}
+        virtual_interfaces:
+          instances:
+            - vrrp_instance_name: VI_CONTROL
+              virtual_router_id: 51
+              keepalive_interface:
+                get_param: ControlVirtualInterface
+              priority: 101
+              virtual_ips:
+              - ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+                interface:
+                  get_param: ControlVirtualInterface
+            - vrrp_instance_name: VI_PUBLIC
+              virtual_router_id: 52
+              keepalive_interface:
+                get_param: PublicVirtualInterface
+              priority: 101
+              virtual_ips:
+              - ip: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
+                interface:
+                  get_param: PublicVirtualInterface
+          vrrp_sync_groups:
+            - name: VG1
+              members:
+                - VI_CONTROL
+                - VI_PUBLIC
+        keepalived:
+          keepalive_interface:
+            get_param: PublicVirtualInterface
+          priority: 101
+        virtual_ips:
+            -
+              ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+              interface:
+                get_param: ControlVirtualInterface
+            -
+              ip: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
+              interface:
+                get_param: PublicVirtualInterface
+        haproxy:
+          nodes:
+            Merge::Map:
+              controller0:
+                ip: {get_attr: [controller0, networks, ctlplane, 0]}
+                name: {get_attr: [controller0, show, name]}
+          net_binds:
+            - ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+          services:
+            - name: keystone_admin
+              port: 35357
+              net_binds: &public_binds
+                - ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+                - ip: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
+            - name: keystone_public
+              port: 5000
+              net_binds: *public_binds
+            - name: horizon
+              port: 80
+              net_binds: *public_binds
+            - name: neutron
+              port: 9696
+              net_binds: *public_binds
+            - name: cinder
+              port: 8776
+              net_binds: *public_binds
+            - name: glance_api
+              port: 9292
+              net_binds: *public_binds
+            - name: glance_registry
+              port: 9191
+              net_binds: *public_binds
+            - name: heat_api
+              port: 8004
+              net_binds: *public_binds
+            - name: heat_cloudwatch
+              port: 8003
+              net_binds: *public_binds
+            - name: heat_cfn
+              port: 8000
+              net_binds: *public_binds
+            - name: nova_ec2
+              port: 8773
+            - name: nova_osapi
+              port: 8774
+              net_binds: *public_binds
+            - name: nova_metadata
+              port: 8775
+              net_binds: *public_binds
+            - name: ceilometer
+              port: 8777
+              net_binds: *public_binds
+            - name: swift_proxy_server
+              port: 8080
+              net_binds: *public_binds
+            - name: rabbitmq
+              port: 5672
+              options:
+                - timeout client 0
+                - timeout server 0
+  controllerPassthrough:
+    type: OS::Heat::StructuredConfig
+    properties:
+      group: os-apply-config
+      config: {get_input: passthrough_config}
+  controller0:
+    type: OS::Nova::Server
+    properties:
+      image:
+        get_param: controllerImage
+      image_update_policy:
+        get_param: ImageUpdatePolicy
+      flavor:
+        get_param: OvercloudControlFlavor
+      key_name:
+        get_param: KeyName
+      networks:
+        - network: ctlplane
+      user_data_format: SOFTWARE_CONFIG
+  controller0AllNodes:
+    depends_on: [controller0Deployment,controller0SSLDeployment,controller0Swift,controller0Passthrough]
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: allNodesConfig}
+      server: {get_resource: controller0}
+  controller0Deployment:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      signal_transport: NO_SIGNAL
+      config: {get_resource: controllerConfig}
+      server: {get_resource: controller0}
+      input_values:
+        bootstack_nodeid: {get_attr: [controller0, show, name]}
+        controller_host: {get_attr: [controller0, networks, ctlplane, 0]}
+        controller_virtual_ip:
+          {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
+        heat.watch_server_url:
+          list_join:
             - ''
             - - 'http://'
-              - Fn::Select:
-                - 0
-                - Fn::Select:
-                  - 'ctlplane'
-                  - Fn::GetAtt:
-                    - notCompute0
-                    - networks
+              - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
               - ':8003'
-        metadata_server_url:
-          Fn::Join:
+        heat.metadata_server_url:
+          list_join:
             - ''
             - - 'http://'
-              - Fn::Select:
-                - 0
-                - Fn::Select:
-                  - 'ctlplane'
-                  - Fn::GetAtt:
-                    - notCompute0
-                    - networks
+              - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
               - ':8000'
-        waitcondition_server_url:
-          Fn::Join:
+        heat.waitcondition_server_url:
+          list_join:
             - ''
             - - 'http://'
-              - Fn::Select:
-                - 0
-                - Fn::Select:
-                  - 'ctlplane'
-                  - Fn::GetAtt:
-                    - notCompute0
-                    - networks
+              - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
               - ':8000/v1/waitcondition'
-      hosts:
-        Fn::Join:
-        - ' '
-        - - Fn::Select:
-            - 0
-            - Fn::Select:
-              - ctlplane
-              - Fn::GetAtt:
-                - notCompute0
-                - networks
-          - {Ref: CloudName}
-      keystone:
-        db: mysql://keystone:unset@localhost/keystone
-        host:
-          Fn::Select:
-            - 0
-            - Fn::Select:
-              - 'ctlplane'
-              - Fn::GetAtt:
-                - notCompute0
-                - networks
-      neutron:
-        flat-networks: {Ref: NeutronFlatNetworks}
-        host:
-          Fn::Select:
-            - 0
-            - Fn::Select:
-              - ctlplane
-              - Fn::GetAtt:
-                - notCompute0
-                - networks
-        metadata_proxy_shared_secret: unset
-        ovs:
-          enable_tunneling: 'True'
-          local_ip:
-            Fn::Select:
-              - 0
-              - Fn::Select:
-                - ctlplane
-                - Fn::GetAtt:
-                  - notCompute0
-                  - networks
-          bridge_mappings: {Ref: NeutronBridgeMappings}
-          public_interface:
-            Ref: NeutronPublicInterface
-          public_interface_raw_device:
-            Ref: NeutronPublicInterfaceRawDevice
-          public_interface_route:
-            Ref: NeutronPublicInterfaceDefaultRoute
-          physical_bridge: br-ex
-          tenant_network_type: gre
-        ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
-        service-password:
-          Ref: NeutronPassword
-      ceilometer:
-        db: mysql://ceilometer:unset@localhost/ceilometer
-        metering_secret: {Ref: CeilometerMeteringSecret}
-        service-password:
-          Ref: CeilometerPassword
-      nova:
-        compute_driver: libvirt.LibvirtDriver
-        db: mysql://nova:unset@localhost/nova
-        default_floating_pool:
-          ext-net
-        host:
-          Fn::Select:
-            - 0
-            - Fn::Select:
-              - 'ctlplane'
-              - Fn::GetAtt:
-                - notCompute0
-                - networks
-        metadata-proxy: true
-        service-password:
-          Ref: NovaPassword
-      os-collect-config:
-        cfn:
-          access_key_id:
-            Ref: notCompute0Key
-          path: notCompute0Config.Metadata
-          secret_access_key:
-            Fn::GetAtt:
-            - notCompute0Key
-            - SecretAccessKey
-          stack_name:
-            Ref: AWS::StackName
-      rabbit:
-        host:
-          Fn::Select:
-            - 0
-            - Fn::Select:
-              - ctlplane
-              - Fn::GetAtt:
-                - notCompute0
-                - networks
-        username:
-          Ref: RabbitUserName
-        password:
-          Ref: RabbitPassword
-        cookie:
-          Fn::GetAtt:
-          - RabbitCookie
-          - value
-      ntp:
-        servers:
-            - {server: {Ref: NtpServer}, fudge: "stratum 0"}
-  notCompute0:
-    Type: OS::Nova::Server
-    Properties:
-      image:
-        Ref: notcomputeImage
-      image_update_policy:
-        Ref: ImageUpdatePolicy
-      flavor:
-        Ref: OvercloudControlFlavor
-      key_name:
-        Ref: KeyName
-    Metadata:
-      os-collect-config:
-        cfn:
-          access_key_id:
-            Ref: notCompute0Key
-          path: notCompute0Config.Metadata
-          secret_access_key:
-            Fn::GetAtt:
-            - notCompute0Key
-            - SecretAccessKey
-          stack_name:
-            Ref: AWS::StackName
-Outputs:
+  allNodesConfig:
+    type: OS::Heat::StructuredConfig
+    properties:
+      config:
+        completion-signal: {get_input: deploy_signal_id}
+        hosts:
+          list_join:
+          - "\n"
+          - - list_join:
+              - "\n"
+              - Merge::Map:
+                  NovaCompute0:
+                    list_join:
+                    - ' '
+                    - - {get_attr: [NovaCompute0, networks, ctlplane, 0]}
+                      - {get_attr: [NovaCompute0, show, name]}
+                      - list_join:
+                        - '.'
+                        - - {get_attr: [NovaCompute0, show, name]}
+                          - 'novalocal'
+            - list_join:
+              - "\n"
+              - Merge::Map:
+                  controller0:
+                    list_join:
+                    - ' '
+                    - - {get_attr: [controller0, networks, ctlplane, 0]}
+                      - {get_attr: [controller0, show, name]}
+                      - list_join:
+                        - '.'
+                        - - {get_attr: [controller0, show, name]}
+                          - 'novalocal'
+                      - {get_param: CloudName}
+        rabbit:
+          nodes:
+            list_join:
+              - ','
+              - Merge::Map:
+                  controller0:
+                    {get_attr: [controller0, show, name]}
+  controller0SSLDeployment:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: SSLConfig}
+      server: {get_resource: controller0}
+      signal_transport: NO_SIGNAL
+      input_values:
+        controller_host: {get_attr: [controller0, networks, ctlplane, 0]}
+        ssl_certificate: {get_param: SSLCertificate}
+        ssl_key: {get_param: SSLKey}
+        ssl_ca_certificate: {get_param: SSLCACertificate}
+  controller0Passthrough:
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: controllerPassthrough}
+      server: {get_resource: controller0}
+      signal_transport: NO_SIGNAL
+      input_values:
+        passthrough_config: {get_param: ExtraConfig}
+outputs:
   KeystoneURL:
-    Description: URL for the Overcloud Keystone service
-    Value:
-      Fn::Join:
+    description: URL for the Overcloud Keystone service
+    value:
+      list_join:
       - ''
       - - http://
-        - Fn::Select:
-          - 0
-          - Fn::Select:
-            - ctlplane
-            - Fn::GetAtt:
-              - notCompute0
-              - networks
+        - {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
         - :5000/v2.0/