Merge "Remove references to Fn::GetAtt."

This commit is contained in:
Jenkins 2013-06-19 22:46:34 +00:00 committed by Gerrit Code Review
commit 5459cbd167
2 changed files with 3 additions and 6 deletions

View File

@ -34,8 +34,7 @@ Resources:
Openstack::ImageBuilder::Elements: [ boot-stack, heat-cfntools, quantum-network-node ]
admin-password: unset
admin-token: unset
controller-address:
Fn::GetAtt: [ notcompute, PublicIp ]
controller-address: 127.0.0.1
cinder:
db: mysql://cinder:unset@localhost/cinder
volume_size_mb: '5000'
@ -86,8 +85,7 @@ Resources:
fixed_range: 10.0.0.0/8
tenant_network_type: gre
enable_tunneling: 'True'
local_ip:
Fn::GetAtt: [ notcompute, PrivateIp ]
local_ip: 127.0.0.1
rabbit:
host: 127.0.0.1
password: guest

View File

@ -89,8 +89,7 @@ Resources:
host: {Ref: QuantumHost}
ovs_db: {Ref: QuantumDSN}
ovs:
local_ip:
Fn::GetAtt: [ NovaCompute, PrivateIp ]
local_ip: 127.0.0.1
tenant_network_type: {Ref: QuantumNetworkType}
network_vlan_ranges: {Ref: QuantumNetworkVLANRanges}
bridge_mappings: {Ref: QuantumBridgeMappings}