From a30615cf8174033c8d8be614e6e8f08767b6f95d Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Mon, 15 Jul 2013 01:40:05 +0000
Subject: [PATCH] Improve Quantum related parameters

---
 manifests/init.pp             |  1 +
 manifests/params.pp           | 11 ++++++++---
 manifests/quantum/agent/l2.pp |  4 ++--
 manifests/quantum/plugin.pp   |  8 ++++----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index a6e9521..3547908 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -41,6 +41,7 @@ class kickstack (
   $cinder_rbd_user = $kickstack::params::cinder_rbd_user,
   $quantum_network_type = $kickstack::params::quantum_network_type,
   $quantum_plugin = $kickstack::params::quantum_plugin,
+  $quantum_physnet = $kickstack::params::quantum_physnet,
   $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,
diff --git a/manifests/params.pp b/manifests/params.pp
index aaf218c..932a46f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -111,13 +111,18 @@ class kickstack::params {
   $quantum_plugin = pick(getvar("::${variable_prefix}quantum_plugin"),"ovs")
 
   # The tenant network type to use with the Quantum ovs and linuxbridge plugins
-  # Supported: vlan (default), gre
-  $quantum_tenant_network_type = pick(getvar("::${variable_prefix}quantum_tenant_network_type"),"vlan")
+  # Supported: flat (default), vlan, gre
+  $quantum_tenant_network_type = pick(getvar("::${variable_prefix}quantum_tenant_network_type"),'vlan')
+
+  # The Quantum physical network name to define
+  $quantum_physnet = pick(getvar("::${variable_prefix}quantum_physnet"),'physnet1')
 
   # The network VLAN ranges to use with the Quantum ovs and linuxbridge plugins
-  $quantum_network_vlan_ranges = pick(getvar("::${variable_prefix}quantum_network_vlan_ranges"),"default:2000:3999")
+  # (ignored unless quantum_tenant_network_type == 'vlan')
+  $quantum_network_vlan_ranges = pick(getvar("::${variable_prefix}quantum_network_vlan_ranges"),"2000:3999")
 
   # The tunnel ID ranges to use with the Quantum ovs plugin, when in gre mode
+  # (ignored unless quantum_tenant_network_type == 'gre')
   $quantum_tunnel_id_ranges = pick(getvar("::${variable_prefix}quantum_tunnel_id_ranges"),"1:1000")
 
   # The interface over which to run your nodes' management network traffic.
diff --git a/manifests/quantum/agent/l2.pp b/manifests/quantum/agent/l2.pp
index d9cc01c..221a643 100644
--- a/manifests/quantum/agent/l2.pp
+++ b/manifests/quantum/agent/l2.pp
@@ -16,9 +16,9 @@ class kickstack::quantum::agent::l2 inherits kickstack {
             tunnel_bridge      => 'br-tun',
           }
         }
-        'vlan': {
+        default: {
           class { 'quantum::agents::ovs':
-            bridge_mappings    => ["default:br-${nic_data}"],
+            bridge_mappings    => ["${::kickstack::quantum_physnet}:br-${nic_data}"],
             bridge_uplinks     => ["br-${nic_data}:${nic_data}"],
             integration_bridge => 'br-int',
             enable_tunneling   => false,
diff --git a/manifests/quantum/plugin.pp b/manifests/quantum/plugin.pp
index 9e0dd08..f310808 100644
--- a/manifests/quantum/plugin.pp
+++ b/manifests/quantum/plugin.pp
@@ -5,12 +5,12 @@ class kickstack::quantum::plugin inherits kickstack {
   $sql_conn = getvar("${fact_prefix}quantum_sql_connection")
   $tenant_network_type = "$::kickstack::quantum_tenant_network_type"
   $network_vlan_ranges = $tenant_network_type ? {
-    'vlan' => "$::kickstack::quantum_network_vlan_ranges",
-    'gre' => ''
+    'gre' => '',
+    default => "${::kickstack::quantum_physnet}:${::kickstack::quantum_network_vlan_ranges}",
   }
   $tunnel_id_ranges = $tenant_network_type ? {
-    'vlan' => '',
-    'gre' => "$::kickstack::quantum_tunnel_id_ranges"
+    'gre' => $::kickstack::quantum_tunnel_id_ranges,
+    default => '',
   }
 
   case "$::kickstack::quantum_plugin" {