Merge pull request #1562 from dpw/fdp-create-bridge

'weave --local create-bridge' is not compatible with fastdp
This commit is contained in:
Adam Harrison committed 2015-10-20 16:37:20 +01:00
commit 720862dafb
1 file changed
+10
+10
View File
@@ -1657,6 +1657,16 @@ case "$COMMAND" in
# intentionally undocumented since it assumes knowledge of weave
# internals
create-bridge)
# This subcommand may be run without the docker daemon, but
# fastdp needs to run the router container to setup the ODP
# bridge, hence:
if [ -z "$WEAVE_NO_FASTDP" ] ; then
cat 1>&2 <<EOF
'weave create-bridge' is not compatible with fast data path. Please set
the WEAVE_NO_FASTDP environment variable.
EOF
exit 1
fi
create_bridge --without-ethtool
;;
launch)