From 1407fe5b01b938b64b69b6f3764218b6f2867e20 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 2 Oct 2014 11:05:47 +0000
Subject: [PATCH] Switch to a more descriptive name for the overlay network
 type

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

diff --git a/hooks/quantum_contexts.py b/hooks/quantum_contexts.py
index d6be5872..baf7cb85 100644
--- a/hooks/quantum_contexts.py
+++ b/hooks/quantum_contexts.py
@@ -107,7 +107,7 @@ def _neutron_api_settings():
     '''
     neutron_settings = {
         'l2_population': True,
-        'ml2_typedriver': 'gre',
+        'overlay_network_type': 'gre',
 
     }
     for rid in relation_ids('neutron-plugin-api'):
@@ -117,7 +117,7 @@ def _neutron_api_settings():
                 continue
             neutron_settings = {
                 'l2_population': rdata['l2-population'],
-                'ml2_typedriver': rdata['neutron-ml2-typedriver'],
+                'overlay_network_type': rdata['overlay-network-type'],
             }
             return neutron_settings
     return neutron_settings
@@ -216,7 +216,7 @@ class QuantumGatewayContext(OSContextGenerator):
             'verbose': config('verbose'),
             'instance_mtu': config('instance-mtu'),
             'l2_population': neutron_api_settings['l2_population'],
-            'ml2_typedriver': neutron_api_settings['ml2_typedriver'],
+            'overlay_network_type': neutron_api_settings['overlay_network_type'],
         }
         return ctxt
 
diff --git a/templates/icehouse/ml2_conf.ini b/templates/icehouse/ml2_conf.ini
index dc5d1564..0de6e19c 100644
--- a/templates/icehouse/ml2_conf.ini
+++ b/templates/icehouse/ml2_conf.ini
@@ -14,7 +14,7 @@ vni_ranges = 1001:2000
 enable_tunneling = True
 local_ip = {{ local_ip }}
 [agent]
-tunnel_types = {{ ml2_typedriver }}
+tunnel_types = {{ overlay_network_type }}
 l2_population = {{ l2_population }}
 [securitygroup]
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver