Remove uses of functions in parameter defaults

This doesn't work in recent versions of Heat and it shouldn't really
have ever worked.

Change-Id: I60772173f8d5baa5768b5626266b2e61cd93fbe2
Closes-Bug: #1282594

3 files changed, 52 insertions, 43 deletions

diff --git a/block-storage.yaml b/block-storage.yaml
index ef55506f..ca56fcef 100644
--- a/block-storage.yaml
+++ b/block-storage.yaml
@@ -4,15 +4,6 @@ Parameters:
   BlockStorageImage:
     Type: String
     Default: overcloud-cinder-volume
-  KeystoneHost:
-    Type: String
-    Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-  MySQLHost:
-    Type: String
-    Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
-  RabbitHost:
-    Type: String
-    Default: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
   RabbitUserName:
     Type: String
     Default: "guest"
@@ -52,16 +43,16 @@ Resources:
           stack_name: {Ref: 'AWS::StackName'}
       OpenStack::ImageBuilder::Elements: [ cinder ]
       keystone:
-        host: {Ref: KeystoneHost}
+        host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
       cinder:
-        db: {"Fn::Join": ['', ['mysql://cinder:unset@', {Ref: MySQLHost}, '/cinder']]}
+        db: {"Fn::Join": ['', ['mysql://cinder:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] } , '/cinder']]}
         volume_size_mb: '5000'
         service-password:
           Ref: CinderPassword
         volume: 'true'
       admin-password: {Ref: AdminPassword}
       rabbit:
-        host: {Ref: RabbitHost}
+        host: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notCompute0, networks]} ]} ] }
         username: {Ref: RabbitUserName}
         password: {Ref: RabbitPassword}
       interfaces:
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 2bec12f9..f51afc4b 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -124,20 +124,6 @@ Parameters:
     Description: The password for RabbitMQ
     Type: String
     NoEcho: true
-  StaticHosts:
-    Default:
-      Fn::Join:
-      - ' '
-      - - Fn::Select:
-          - 0
-          - Fn::Select:
-            - ctlplane
-            - Fn::GetAtt:
-              - notCompute0
-              - networks
-        - {Ref: CloudName}
-    Description: Static content to append to /etc/hosts
-    Type: String
 Resources:
   AccessPolicy:
     Properties:
@@ -207,7 +193,16 @@ Resources:
         NeutronBridgeMappings:
             Ref: NeutronBridgeMappings
         StaticHosts:
-            Ref: StaticHosts
+          Fn::Join:
+          - ' '
+          - - Fn::Select:
+              - 0
+              - Fn::Select:
+                - ctlplane
+                - Fn::GetAtt:
+                  - notCompute0
+                  - networks
+            - {Ref: CloudName}
   NovaCompute0:
     Type: FileInclude
     Path: nova-compute-instance.yaml
@@ -311,7 +306,17 @@ Resources:
                     - notCompute0
                     - networks
               - ':8000/v1/waitcondition'
-      hosts: {Ref: StaticHosts}
+      hosts:
+        Fn::Join:
+        - ' '
+        - - Fn::Select:
+            - 0
+            - Fn::Select:
+              - ctlplane
+              - Fn::GetAtt:
+                - notCompute0
+                - networks
+          - {Ref: CloudName}
       keystone:
         db: mysql://keystone:unset@localhost/keystone
         host:
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 72a5beb1..efce1e87 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -15,17 +15,6 @@ Parameters:
     Default: i386
     Description: The architecture to use in Nova-BM - i386 or amd64.
     Type: String
-  ControllerAddress:
-    Default:
-      Fn::Select:
-        - 0
-        - Fn::Select:
-          - "ctlplane"
-          - Fn::GetAtt:
-            - undercloud
-            - networks
-    Description: The IP address for controller endpoints in config files.
-    Type: String
   Flavor:
     Default: baremetal
     Description: Flavor to request when deploying.
@@ -105,7 +94,13 @@ Resources:
       admin-token: 
         Ref: AdminToken
       controller-address:
-        Ref: ControllerAddress
+        Fn::Select:
+          - 0
+          - Fn::Select:
+            - "ctlplane"
+            - Fn::GetAtt:
+              - undercloud
+              - networks
       cinder:
         db: mysql://cinder:unset@localhost/cinder
         volume_size_mb: '5000'
@@ -129,19 +124,37 @@ Resources:
           Fn::Join:
             - ''
             - - http://
-              - {Ref: ControllerAddress}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8003"
         metadata_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {Ref: ControllerAddress}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8000"
         waitcondition_server_url:
           Fn::Join:
             - ''
             - - http://
-              - {Ref: ControllerAddress}
+              - Fn::Select:
+                  - 0
+                  - Fn::Select:
+                    - "ctlplane"
+                    - Fn::GetAtt:
+                      - undercloud
+                      - networks
               - ":8000/v1/waitcondition"
       os-collect-config:
         cfn: