diff options
author | 2013-06-12 17:12:32 +1200 | |
---|---|---|
committer | 2013-06-12 17:12:32 +1200 | |
commit | 324796f7884cabda6e39e8d1c6e0157ce070887c (patch) | |
tree | 7b9457c44a8b066646cebe9f2365be3e9ecc6277 /nova-compute-instance.yaml | |
parent | 823ef3d4347354a0f31b90b51ddaad721e049fbe (diff) |
Parameterise more settings for nova and quantum.
Change-Id: Ia35431302848666ad013adaeae1d06482cd3117a
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r-- | nova-compute-instance.yaml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index f508377a..d885cba3 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -36,6 +36,14 @@ Parameters: Type: String QuantumDSN: Type: String + QuantumBridgeMappings: + Type: String + QuantumNetworkVLANRanges: + Type: String + QuantumNetworkType: + Type: String + QuantumEnableTunnelling: + Type: String Resources: AccessPolicy: Type: OS::Heat::AccessPolicy @@ -83,10 +91,10 @@ Resources: ovs: local_ip: Fn::GetAtt: [ NovaCompute, PrivateIp ] - tenant_network_type: gre - network_vlan_ranges: '' - bridge_mappings: '' - enable_tunneling: 'True' + tenant_network_type: {Ref: QuantumNetworkType} + network_vlan_ranges: {Ref: QuantumNetworkVLANRanges} + bridge_mappings: {Ref: QuantumBridgeMappings} + enable_tunneling: {Ref: QuantumEnableTunnelling} service-password: {Ref: ServicePassword} admin-password: {Ref: ServicePassword} |