aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-19 22:46:34 +0000
committerGerrit Code Review <review@openstack.org>2013-06-19 22:46:34 +0000
commit5459cbd167e38a0b7c2d7fa0d72bedb68ce40bad (patch)
treec076ecfd1eff7415481cc5557de4d86f99755466
parentbbd0f5ea08225dfedcc75e06ce8ac4695f126f13 (diff)
parenta073f1c3eb0842563321c903cd630abd7b81bb41 (diff)
Merge "Remove references to Fn::GetAtt."
-rw-r--r--bootstack-vm.yaml6
-rw-r--r--nova-compute-instance.yaml3
2 files changed, 3 insertions, 6 deletions
diff --git a/bootstack-vm.yaml b/bootstack-vm.yaml
index 77b74161..13d99cef 100644
--- a/bootstack-vm.yaml
+++ b/bootstack-vm.yaml
@@ -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
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index d885cba3..91c9ce69 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -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}