diff options
| author |   Clint Byrum <clint@fewbar.com> | 2014-02-20 15:40:01 +0000 |
|---|---|---|
| committer |   James Slagle <jslagle@redhat.com> | 2014-02-20 12:39:32 -0500 |
| commit | b6ee51161e77dcbe61de3365052039865742a7a0 (patch) | |
| tree | 516d36c036aa6642cf3212a0878d4b4b01c463fd /block-storage.yaml | |
| parent | ff0959a200cfad26d0c688bf293e3ebeb365ff48 (diff) | |
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
Diffstat (limited to 'block-storage.yaml')
| -rw-r--r-- | block-storage.yaml | 15 |
1 files changed, 3 insertions, 12 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: |