openstack/devstack
Code Issues Proposed changes

Merge "Stop setting deprecated OVS.enable_tunneling option"

Browse Source
This commit is contained in:
Jenkins 2014-10-31 11:23:43 +00:00 committed by Gerrit Code Review
commit 956960e1b2
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/neutron_plugins/ofagent_agent
View File

@ -61,7 +61,6 @@ function neutron_plugin_configure_plugin_agent {
if [ `vercmp_numbers "$OVS_VERSION" "1.4"` -lt "0" ]; then
die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
fi
iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
fi

5
lib/neutron_plugins/openvswitch
View File

@ -38,11 +38,6 @@ function neutron_plugin_configure_service {
iniset /$Q_PLUGIN_CONF_FILE ovs network_vlan_ranges $OVS_VLAN_RANGES
fi
# Enable tunnel networks if selected
if [[ $OVS_ENABLE_TUNNELING == "True" ]]; then
iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True
fi
_neutron_ovs_base_configure_firewall_driver
# Define extra "OVS" configuration options when q-svc is configured by defining

1
lib/neutron_plugins/openvswitch_agent
View File

@ -47,7 +47,6 @@ function neutron_plugin_configure_plugin_agent {
if [ `vercmp_numbers "$OVS_VERSION" "1.4"` -lt "0" ] && ! is_service_enabled q-svc ; then
die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
fi
iniset /$Q_PLUGIN_CONF_FILE ovs enable_tunneling True
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
fi