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
---
 overcloud-source.yaml | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'overcloud-source.yaml')

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