From 53bfb48db393711c932c88c88aeb49e8a16bae4b Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Tue, 3 Mar 2015 14:24:10 +0800
Subject: [PATCH] more

---
 hooks/neutron_ovs_context.py    | 8 ++++++++
 templates/icehouse/ml2_conf.ini | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/hooks/neutron_ovs_context.py b/hooks/neutron_ovs_context.py
index 303003a8..e860c424 100644
--- a/hooks/neutron_ovs_context.py
+++ b/hooks/neutron_ovs_context.py
@@ -18,6 +18,7 @@ from charmhelpers.contrib.network.ip import get_address_in_network
 from charmhelpers.contrib.openstack.neutron import (
     parse_bridge_mappings,
     parse_data_port_mappings,
+    parse_vlan_range_mappings,
 )
 from charmhelpers.contrib.openstack.context import (
     NeutronPortContext,
@@ -148,6 +149,13 @@ class OVSPluginContext(context.NeutronContext):
         if mappings:
             ovs_ctxt['bridge_mappings'] = mappings
 
+        vlan_ranges = config('vlan-ranges')
+        vlan_range_mappings = parse_vlan_range_mappings(config('vlan-ranges'))
+        if vlan_ranges:
+            providers = vlan_range_mappings.keys()
+            ovs_ctxt['network_providers'] = ' '.join(providers)
+            ovs_ctxt['vlan_ranges'] = vlan_ranges
+
         return ovs_ctxt
 
 
diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini
index 575953d8..f2aa23e3 100644
--- a/templates/icehouse/ml2_conf.ini
+++ b/templates/icehouse/ml2_conf.ini
@@ -16,10 +16,10 @@ tunnel_id_ranges = 1:1000
 vni_ranges = 1001:2000
 
 [ml2_type_vlan]
-network_vlan_ranges = physnet1:1000:2000
+network_vlan_ranges = {{ vlan_ranges }}
 
 [ml2_type_flat]
-flat_networks = physnet1
+flat_networks = {{ network_providers }}
 
 [ovs]
 enable_tunneling = True