From ed6409f7561d8612e216de93de896b9cc78524a6 Mon Sep 17 00:00:00 2001
From: Bob Fournier <bfournie@redhat.com>
Date: Mon, 18 Jul 2016 18:21:27 -0400
Subject: [PATCH] Remove NeutronEnableTunnelling from templates

As described in https://bugs.launchpad.net/tripleo/+bug/1532830,
the OVS agent no longer uses enable_tunneling, which is controlled by
NeutronEnableTunnelling, so this change removes NeutronEnableTunnelling
from the Heat templates.

This change depends on NeutronEnableTunnelling also being removed
from python-tripleoclient and puppet-neutron no longer using the
enable_tunneling hieradata.

Change-Id: I1ff6902ebd15041fc57ffff20a07455f171a004b
Closes-Bug: 1532830
Depends-On: I28d33592374f60cb5222a866efaf9d137aca1c5a
Depends-On: I73630653330c67444827f32740c44e9d25b5db31
---
 environments/network-environment.yaml  | 2 ++
 environments/neutron-opencontrail.yaml | 2 +-
 environments/puppet-tenant-vlan.yaml   | 2 +-
 puppet/services/neutron-ovs-agent.yaml | 4 ----
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/environments/network-environment.yaml b/environments/network-environment.yaml
index 062c7beea1..cf94d7fc38 100644
--- a/environments/network-environment.yaml
+++ b/environments/network-environment.yaml
@@ -46,5 +46,7 @@ parameter_defaults:
   ExternalNetworkVlanID: 50
   # Set to empty string to enable multiple external networks or VLANs
   NeutronExternalNetworkBridge: "''"
+  # The tunnel type for the tenant network (vxlan or gre). Set to '' to disable tunneling.
+  NeutronTunnelTypes: 'vxlan'
   # Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
   BondInterfaceOvsOptions: "bond_mode=active-backup"
diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml
index 4895287ead..f2209ce27c 100644
--- a/environments/neutron-opencontrail.yaml
+++ b/environments/neutron-opencontrail.yaml
@@ -14,7 +14,7 @@ resource_registry:
 parameter_defaults:
   NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2
   NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
-  NeutronEnableTunnelling: false
+  NeutronTunnelTypes: ''
 
   # required params:
   #ContrailApiServerIp:
diff --git a/environments/puppet-tenant-vlan.yaml b/environments/puppet-tenant-vlan.yaml
index ed948bc518..45d2117a48 100644
--- a/environments/puppet-tenant-vlan.yaml
+++ b/environments/puppet-tenant-vlan.yaml
@@ -1,4 +1,4 @@
 parameter_defaults:
   NeutronNetworkType: vlan
-  NeutronEnableTunnelling: false
+  NeutronTunnelTypes: ''
   NeutronNetworkVLANRanges: datacentre:1:1000
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
index 7a97cd8418..d52b8a268d 100644
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@@ -9,9 +9,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  NeutronEnableTunnelling:
-    type: string
-    default: "True"
   NeutronEnableL2Pop:
     type: string
     description: >
@@ -56,7 +53,6 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
-            neutron::agents::ml2::ovs::enable_tunneling: {get_param: NeutronEnableTunnelling}
             neutron::agents::ml2::ovs::l2_population: {get_param: NeutronEnableL2Pop}
             neutron::agents::ml2::ovs::enable_distributed_routing: {get_param: NeutronEnableDVR}
             neutron::agents::ml2::ovs::bridge_mappings: