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
---
 block-storage.yaml | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'block-storage.yaml')

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