diff options
| author |   Clint Byrum <clint@fewbar.com> | 2013-09-17 12:32:24 -0700 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2013-09-17 12:41:07 -0700 |
| commit | c2051996bc2262764c601763d5c98652baa14066 (patch) | |
| tree | 4c64a1e2b98a62a32ef29b53276ebffe1a8c70e3 | |
| parent | 287e97de9cc3dce498403c9cae69ae48108def9c (diff) | |
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
| -rw-r--r-- | nagios3.yaml | 3 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 10 | ||||
| -rw-r--r-- | overcloud-source.yaml | 40 |
3 files changed, 35 insertions, 18 deletions
diff --git a/nagios3.yaml b/nagios3.yaml index 0bdb1d38..5c36329e 100644 --- a/nagios3.yaml +++ b/nagios3.yaml @@ -96,5 +96,4 @@ Resources: Ref: Nagios3ImageId InstanceType: {Ref: InstanceType} Outputs: - Nagios3Host: - Fn::GetAtt: [ nagios3 , first_private_address ] + Nagios3Host: {'Fn::Select': [ 0, {'Fn::Select': [ 'ctlplane', 'Fn::GetAtt': [ 'nagios3' , 'networks' ] ]} ]} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index ca8ff111..62f3b29c 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -114,9 +114,13 @@ Resources: ovs_db: {Ref: NeutronDSN} ovs: local_ip: - Fn::GetAtt: - - NovaCompute0 - - first_private_address + Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - NovaCompute0 + - networks tenant_network_type: {Ref: NeutronNetworkType} network_vlan_ranges: {Ref: NeutronNetworkVLANRanges} bridge_mappings: {Ref: NeutronBridgeMappings} 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 |