From ed9b89aeff2f7d3778ae16c05308c338a6502d3c Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Mon, 10 Nov 2014 11:06:40 +0000
Subject: [PATCH] Temp hardcode on neutron-api charm data

---
 templates/ml2_conf.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/templates/ml2_conf.ini b/templates/ml2_conf.ini
index 6da556f..08e1496 100644
--- a/templates/ml2_conf.ini
+++ b/templates/ml2_conf.ini
@@ -26,8 +26,10 @@ local_ip = {{ local_ip }}
 bridge_mappings = physnet1:br-data
 
 [agent]
-tunnel_types = gre # {{ overlay_network_type }}
-l2_population = True # {{ l2_population }}
+tunnel_types = gre
+# {{ overlay_network_type }}
+l2_population = True
+# {{ l2_population }}
 
 [securitygroup]
 {% if neutron_security_groups -%}