From a0c8fc2ddb663a9ed65d87f1881f30dcf3b47b5c Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Sun, 17 Dec 2017 19:05:12 +0100 Subject: [PATCH] Pass WEAVE_NO_BRIDGED_FASTDP to weaver --- prog/weaver/main.go | 1 + weave | 1 + 2 files changed, 2 insertions(+) diff --git a/prog/weaver/main.go b/prog/weaver/main.go index c12b4c03..89074327 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -197,6 +197,7 @@ func main() { mflag.StringVar(&dnsConfig.ResolvConf, []string{"-resolv-conf"}, "", "path to resolver configuration for fallback DNS lookups") mflag.StringVar(&bridgeConfig.DatapathName, []string{"-datapath"}, "", "ODP datapath name") mflag.BoolVar(&bridgeConfig.NoFastdp, []string{"-no-fastdp"}, false, "Disable Fast Datapath") + mflag.BoolVar(&bridgeConfig.NoBridgedFastdp, []string{"-no-bridged-fastdp"}, false, "Disable Bridged Fast Datapath") mflag.StringVar(&trustedSubnetStr, []string{"-trusted-subnets"}, "", "comma-separated list of trusted subnets in CIDR notation") mflag.StringVar(&dbPrefix, []string{"-db-prefix"}, "/weavedb/weave", "pathname/prefix of filename to store data") mflag.StringVar(&procPath, []string{"-proc-path"}, "/proc", "path to reach host /proc filesystem") diff --git a/weave b/weave index 98913edf..db80efe5 100755 --- a/weave +++ b/weave @@ -536,6 +536,7 @@ router_bridge_opts() { echo --docker-bridge "$DOCKER_BRIDGE" --weave-bridge "$BRIDGE" --datapath "$DATAPATH" [ -z "$WEAVE_MTU" ] || echo --mtu "$WEAVE_MTU" [ -z $WEAVE_NO_FASTDP ] || echo --no-fastdp + [ -z $WEAVE_NO_BRIDGED_FASTDP ] || echo --no-bridged-fastdp } ######################################################################