|
...
|
...
|
@@ -44,12 +44,6 @@ function neutron_plugin_configure_plugin_agent {
|
|
44
|
44
|
|
|
45
|
45
|
# Setup agent for tunneling
|
|
46
|
46
|
if [[ "$OVS_ENABLE_TUNNELING" == "True" ]]; then
|
|
47
|
|
- # Verify tunnels are supported
|
|
48
|
|
- # REVISIT - also check kernel module support for GRE and patch ports
|
|
49
|
|
- OVS_VERSION=`ovs-vsctl --version | head -n 1 | grep -E -o "[0-9]+\.[0-9]+"`
|
|
50
|
|
- if [ `vercmp_numbers "$OVS_VERSION" "1.4"` -lt "0" ] && ! is_service_enabled q-svc ; then
|
|
51
|
|
- die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
|
|
52
|
|
- fi
|
|
53
|
47
|
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
|
|
54
|
48
|
iniset /$Q_PLUGIN_CONF_FILE ovs tunnel_bridge $OVS_TUNNEL_BRIDGE
|
|
55
|
49
|
fi
|