x/packstack
Code Issues Proposed changes

Merge "Make CONFIG_NEUTRON_OVS_VXLAN_UDP_PORT work with ML2"

Browse Source
This commit is contained in:
Jenkins
2014-04-07 05:53:03 +00:00
committed by Gerrit Code Review
parent f64d43b4e7 539a644ec3
commit 4dfa9fa5a8
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packstack/plugins/neutron_350.py
View File

@@ -483,8 +483,15 @@ def initConfig(controllerObject):
return use_openvswitch_plugin_tunnel(config) or use_ml2_with_ovs(config) return use_openvswitch_plugin_tunnel(config) or use_ml2_with_ovs(config)
def use_openvswitch_vxlan(config): def use_openvswitch_vxlan(config):
return (use_openvswitch_plugin_tunnel(config) and ovs_vxlan = (
config['CONFIG_NEUTRON_OVS_TENANT_NETWORK_TYPE'] == 'vxlan') use_openvswitch_plugin_tunnel(config) and
config['CONFIG_NEUTRON_OVS_TENANT_NETWORK_TYPE'] == 'vxlan'
)
ml2_vxlan = (
use_ml2_with_ovs(config) and
'vxlan' in config['CONFIG_NEUTRON_ML2_TENANT_NETWORK_TYPES']
)
return ovs_vxlan or ml2_vxlan
conf_groups = [ conf_groups = [