From ce10111793a2d1a67cbdd2d38780bd0662bf28b1 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Tue, 16 Jul 2013 12:37:57 +0200
Subject: [PATCH] Add parameters for integration, tunnel, and external bridges

---
 manifests/init.pp   |  3 +++
 manifests/params.pp | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/manifests/init.pp b/manifests/init.pp
index 3547908..d022c60 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -45,6 +45,9 @@ class kickstack (
   $quantum_tenant_network_type = $kickstack::params::quantum_tenant_network_type,
   $quantum_network_vlan_ranges = $kickstack::params::quantum_network_vlan_ranges,
   $quantum_tunnel_id_ranges = $kickstack::params::quantum_tunnel_id_ranges,
+  $quantum_integration_bridge = $kickstack::params::quantum_integration_bridge,
+  $quantum_tunnel_bridge = $kickstack::params::quantum_tunnel_bridge,
+  $quantum_external_bridge = $kickstack::params::quantum_external_bridge,
   $nic_management = $kickstack::params::nic_management,
   $nic_data = $kickstack::params::nic_data,
   $nic_external = $kickstack::params::nic_external,
diff --git a/manifests/params.pp b/manifests/params.pp
index 932a46f..9af938f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -125,6 +125,18 @@ class kickstack::params {
   # (ignored unless quantum_tenant_network_type == 'gre')
   $quantum_tunnel_id_ranges = pick(getvar("::${variable_prefix}quantum_tunnel_id_ranges"),"1:1000")
 
+  # The Quantum integration bridge
+  # Default: br-int (normally doesn't need to be changed)
+  $quantum_integration_bridge = pick(getvar("::${variable_prefix}quantum_integration_bridge"),'br-int')
+
+  # The Quantum tunnel bridge (irrelevant unless $quantum_tenant_network_type=='gre')
+  # Default: br-tun (normally doesn't need to be changed)
+  $quantum_tunnel_bridge = pick(getvar("::${variable_prefix}quantum_tunnel_bridge"),'br-tun')
+
+  # The Quantum external bridge
+  # Default: br-ex (normally doesn't need to be changed)
+  $quantum_external_bridge = pick(getvar("::${variable_prefix}quantum_external_bridge"),'br-ex')
+
   # The interface over which to run your nodes' management network traffic.
   # Normally, this would be your primary network interface.
   $nic_management = pick(getvar("::${variable_prefix}nic_management"),"eth0")