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 /overcloud-source.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 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 37 |
1 files changed, 21 insertions, 16 deletions
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: |