openstack/devstack
Code Issues Proposed changes

Merge "Remove check for OVS_VERSION < 1.4"

Browse Source
This commit is contained in:
Jenkins 2016-03-10 15:05:11 +00:00 committed by Gerrit Code Review
commit f3e9ad5845
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/neutron_plugins/openvswitch_agent
View File

@ -44,12 +44,6 @@ function neutron_plugin_configure_plugin_agent {
# Setup agent for tunneling # Setup agent for tunneling
if [[ "$OVS_ENABLE_TUNNELING" == "True" ]]; then if [[ "$OVS_ENABLE_TUNNELING" == "True" ]]; then
# Verify tunnels are supported
# REVISIT - also check kernel module support for GRE and patch ports
OVS_VERSION=`ovs-vsctl --version | head -n 1 | grep -E -o "[0-9]+\.[0-9]+"`
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 local_ip $TUNNEL_ENDPOINT_IP iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
iniset /$Q_PLUGIN_CONF_FILE ovs tunnel_bridge $OVS_TUNNEL_BRIDGE iniset /$Q_PLUGIN_CONF_FILE ovs tunnel_bridge $OVS_TUNNEL_BRIDGE
fi fi