From 5bfe69f4d28f38d193c4d812300895a2f4229010 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 26 Mar 2015 10:49:09 +0000
Subject: [PATCH] Fix juno templates

---
 templates/juno/ml2_conf.ini | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/templates/juno/ml2_conf.ini b/templates/juno/ml2_conf.ini
index 5354b4c2..4c1dfa9d 100644
--- a/templates/juno/ml2_conf.ini
+++ b/templates/juno/ml2_conf.ini
@@ -14,20 +14,23 @@ 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
 local_ip = {{ local_ip }}
-bridge_mappings = physnet1:br-data
+bridge_mappings = {{ bridge_mappings }}
 
 [agent]
 tunnel_types = {{ overlay_network_type }}
 l2_population = {{ l2_population }}
 enable_distributed_routing = {{ enable_dvr }}
+{% if veth_mtu -%}
+veth_mtu = {{ veth_mtu }}
+{% endif %}
 
 [securitygroup]
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver