From c2051996bc2262764c601763d5c98652baa14066 Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Tue, 17 Sep 2013 12:32:24 -0700 Subject: Finish correcting all OS::Nova::Server references Some references to first_private_address were missed and some of the Fn::Select calls were only half-completed. Change-Id: I92a4e5e67784e5d64ec6e44ddcac55762cde81eb --- overcloud-source.yaml | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) (limited to 'overcloud-source.yaml') diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 2c9213ad..3298e69f 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -176,10 +176,12 @@ Resources: - '' - - 'http://' - Fn::Select: - - 'ctlplane' - - Fn::GetAtt: - - notcompute - - networks + - 0 + - Fn::Select: + - 'ctlplane' + - Fn::GetAtt: + - notcompute + - networks - ':8003' metadata_server_url: Fn::Join: @@ -233,16 +235,24 @@ Resources: Ref: NovaPassword neutron: host: - Fn::GetAtt: - - notcompute - - first_private_address + Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - notcompute + - networks metadata_proxy_shared_secret: unset ovs: enable_tunneling: 'True' local_ip: - Fn::GetAtt: - - notcompute - - first_private_address + Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - notcompute + - networks public_interface: eth0 physical_bridge: br-ex tenant_network_type: gre @@ -251,9 +261,13 @@ Resources: Ref: NeutronPassword rabbit: host: - Fn::GetAtt: - - notcompute - - first_private_address + Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - notcompute + - networks password: guest notcompute: Type: OS::Nova::Server -- cgit 1.2.3-korg