diff options
| author |   Bob Fournier <bfournie@redhat.com> | 2016-07-18 18:21:27 -0400 |
|---|---|---|
| committer |   Brent Eagles <beagles@redhat.com> | 2016-08-12 20:46:38 -0230 |
| commit | ed6409f7561d8612e216de93de896b9cc78524a6 (patch) | |
| tree | 1536352e020ffa9f1a4e797dc9d965750b17317c /environments/neutron-opencontrail.yaml | |
| parent | 8c61510e601473cabd60264eff7fc5b6f9f2ebb8 (diff) | |
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
Diffstat (limited to 'environments/neutron-opencontrail.yaml')
| -rw-r--r-- | environments/neutron-opencontrail.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml index 4895287e..f2209ce2 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: |