From: Robert Collins <rbtcollins@hp.com>
Date: Wed, 12 Jun 2013 05:12:32 +0000 (+1200)
Subject: Parameterise more settings for nova and quantum.
X-Git-Tag: opnfv-6.0.0~3004
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=324796f7884cabda6e39e8d1c6e0157ce070887c;p=apex-tripleo-heat-templates.git

Parameterise more settings for nova and quantum.

Change-Id: Ia35431302848666ad013adaeae1d06482cd3117a
---

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}