From 5120b4b46818af11cb7ef689075252280c7635b8 Mon Sep 17 00:00:00 2001
From: David Wragg <david@wragg.org>
Date: Tue, 20 Oct 2015 16:34:50 +0100
Subject: [PATCH] 'weave --local create-bridge' is not compatible with fastdp

---
 weave | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/weave b/weave
index d560c278..979bc800 100755
--- a/weave
+++ b/weave
@@ -1635,6 +1635,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)