From b6ee51161e77dcbe61de3365052039865742a7a0 Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@fewbar.com>
Date: Thu, 20 Feb 2014 15:40:01 +0000
Subject: 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
---
 undercloud-source.yaml | 43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

(limited to 'undercloud-source.yaml')

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:
-- 
cgit 1.2.3-korg