openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove NeutronEnableTunnelling from templates

Browse Source 
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
This commit is contained in:
Bob Fournier 2016-07-18 18:21:27 -04:00 committed by Brent Eagles
parent 8c61510e60
commit ed6409f756
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/network-environment.yaml
View File

@ -46,5 +46,7 @@ parameter_defaults:
ExternalNetworkVlanID: 50 ExternalNetworkVlanID: 50
# Set to empty string to enable multiple external networks or VLANs # Set to empty string to enable multiple external networks or VLANs
NeutronExternalNetworkBridge: "''" 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" # Customize bonding options, e.g. "mode=4 lacp_rate=1 updelay=1000 miimon=100"
BondInterfaceOvsOptions: "bond_mode=active-backup" BondInterfaceOvsOptions: "bond_mode=active-backup"

2
environments/neutron-opencontrail.yaml
View File

@ -14,7 +14,7 @@ resource_registry:
parameter_defaults: parameter_defaults:
NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2 NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2
NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin NeutronServicePlugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.plugin.LoadBalancerPlugin
NeutronEnableTunnelling: false NeutronTunnelTypes: ''
# required params: # required params:
#ContrailApiServerIp: #ContrailApiServerIp:

2
environments/puppet-tenant-vlan.yaml
View File

@ -1,4 +1,4 @@
parameter_defaults: parameter_defaults:
NeutronNetworkType: vlan NeutronNetworkType: vlan
NeutronEnableTunnelling: false NeutronTunnelTypes: ''
NeutronNetworkVLANRanges: datacentre:1:1000 NeutronNetworkVLANRanges: datacentre:1:1000

4
puppet/services/neutron-ovs-agent.yaml
View File

@ -9,9 +9,6 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry. via parameter_defaults in the resource registry.
type: json type: json
NeutronEnableTunnelling:
type: string
default: "True"
NeutronEnableL2Pop: NeutronEnableL2Pop:
type: string type: string
description: > description: >
@ -56,7 +53,6 @@ outputs:
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [NeutronBase, role_data, config_settings] - 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::l2_population: {get_param: NeutronEnableL2Pop}
neutron::agents::ml2::ovs::enable_distributed_routing: {get_param: NeutronEnableDVR} neutron::agents::ml2::ovs::enable_distributed_routing: {get_param: NeutronEnableDVR}
neutron::agents::ml2::ovs::bridge_mappings: neutron::agents::ml2::ovs::bridge_mappings: