summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Higgins <derekh@redhat.com>2013-06-14 00:16:34 +0100
committerDerek Higgins <derekh@redhat.com>2013-06-19 23:42:33 +0100
commita073f1c3eb0842563321c903cd630abd7b81bb41 (patch)
tree8d0b4d5a3765995097d56643a14600bf308e4bd2
parent324796f7884cabda6e39e8d1c6e0157ce070887c (diff)
Remove references to Fn::GetAtt.
These were causing a Circular dependency error during the creation of a stack. Change-Id: Iccdf4a081f38aa3a5fe0e250b9e9382958a0f26e
-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 91456c67..b1754452 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'
@@ -84,8 +83,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}