From fdfaf687a58001126e0442d83b1183d79f91cee5 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Wed, 11 Jun 2014 09:48:07 +0000
Subject: [PATCH] Tidyup templates and add comment to templates to say whose
 managing the file

---
 templates/havana/ovs_neutron_plugin.ini     | 19 -------------------
 templates/icehouse/ml2_conf.ini             |  1 +
 templates/{havana => icehouse}/neutron.conf |  1 +
 3 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 templates/havana/ovs_neutron_plugin.ini
 rename templates/{havana => icehouse}/neutron.conf (95%)

diff --git a/templates/havana/ovs_neutron_plugin.ini b/templates/havana/ovs_neutron_plugin.ini
deleted file mode 100644
index e0c53f9e..00000000
--- a/templates/havana/ovs_neutron_plugin.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-# havana
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
-###############################################################################
-[OVS]
-tunnel_id_ranges = 1:1000
-tenant_network_type = gre
-enable_tunneling = True
-local_ip = {{ local_ip }}
-
-[AGENT]
-polling_interval = 2
-
-[SECURITYGROUP]
-{% if neutron_security_groups -%}
-firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
-{% endif -%}
-
diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini
index 53985e24..fac0f5bc 100644
--- a/templates/icehouse/ml2_conf.ini
+++ b/templates/icehouse/ml2_conf.ini
@@ -2,6 +2,7 @@
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.
+# Config managed by neutron-openvswitch charm
 ###############################################################################
 [ml2]
 type_drivers = gre,vxlan
diff --git a/templates/havana/neutron.conf b/templates/icehouse/neutron.conf
similarity index 95%
rename from templates/havana/neutron.conf
rename to templates/icehouse/neutron.conf
index 50142f24..341967a5 100644
--- a/templates/havana/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -2,6 +2,7 @@
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.
+# Config managed by neutron-openvswitch charm
 ###############################################################################
 [DEFAULT]
 state_path = /var/lib/neutron