From 35765345f01d7c446263722026665ad9c21b6d0d Mon Sep 17 00:00:00 2001
From: Ed Bak <ed.bak2@hp.com>
Date: Thu, 8 May 2014 20:26:56 +0000
Subject: [PATCH] Enable additional ml2_conf.ini configuration

This change allows mechanism_drivers and vni_ranges to be
configurable.  Also, enables config passthrough support for
ml2_conf.ini.

Change-Id: Ifd8e5c52b89ae5eeab1a1399fe9dd77bf0c67ec6
---
 .../etc/neutron/plugins/ml2/ml2_conf.ini      | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini b/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini
index 4b383650d..89d820d43 100644
--- a/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini
+++ b/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini
@@ -1,6 +1,11 @@
 [ml2]
 type_drivers = local,flat,vlan,gre,vxlan
+{{#neutron.mechanism_drivers}}
+mechanism_drivers = {{neutron.mechanism_drivers}}
+{{/neutron.mechanism_drivers}}
+{{^neutron.mechanism_drivers}}
 mechanism_drivers = openvswitch
+{{/neutron.mechanism_drivers}}
 tenant_network_types = {{neutron.ovs.tenant_network_type}}
 
 [ml2_type_flat]
@@ -14,7 +19,12 @@ flat_networks={{neutron.flat-networks}}
 tunnel_id_ranges = 1:1000
 
 [ml2_type_vxlan]
+{{#neutron.vni_ranges}}
+vni_ranges = {{neutron.vni_ranges}}
+{{/neutron.vni_ranges}}
+{{^neutron.vni_ranges}}
 vni_ranges = 1001:2000
+{{/neutron.vni_ranges}}
 
 [database]
 connection = {{neutron.ovs_db}}
@@ -27,3 +37,13 @@ root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
 
 [securitygroup]
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
+
+{{#ml2}}
+{{#config}}
+{{#comment}} repeats for each section {{/comment}}
+[{{section}}]
+{{#values}}
+{{option}}={{value}}
+{{/values}}
+{{/config}}
+{{/ml2}}