Merge pull request #1983 from weaveworks/1929-auto-detect-odp-on-relaunch
don't complain on relaunch when ODP is not supported
This commit is contained in:
commit
4b0a6e1433
1 file changed
+3
-1
@@ -536,7 +536,9 @@ create_bridge() {
|
|||||||
add_iptables_rule nat POSTROUTING -j WEAVE
|
add_iptables_rule nat POSTROUTING -j WEAVE
|
||||||
else
|
else
|
||||||
if [ -n "$LAUNCHING_ROUTER" ] ; then
|
if [ -n "$LAUNCHING_ROUTER" ] ; then
|
||||||
if [ "$BRIDGE_TYPE" = bridge -a -z "$WEAVE_NO_FASTDP" ] ; then
|
if [ "$BRIDGE_TYPE" = bridge -a -z "$WEAVE_NO_FASTDP" ] &&
|
||||||
|
util_op create-datapath $DATAPATH 2>/dev/null &&
|
||||||
|
util_op delete-datapath $DATAPATH 2>/dev/null ; then
|
||||||
cat <<EOF >&1
|
cat <<EOF >&1
|
||||||
WEAVE_NO_FASTDP is not set, but there is already a bridge present of
|
WEAVE_NO_FASTDP is not set, but there is already a bridge present of
|
||||||
the wrong type for fast datapath. Please do 'weave reset' to remove
|
the wrong type for fast datapath. Please do 'weave reset' to remove
|
||||||
|
|||||||
Reference in new issue
Block a user