From 9fd1a43769ff47c83630989e24016c0b02d5bc6f Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 24 Apr 2017 09:43:10 +0000 Subject: [PATCH] Put back some weave bridge options ability to set MTU was lost in an earlier change --- prog/weave-kube/launch.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh index 35557fb4..60899189 100755 --- a/prog/weave-kube/launch.sh +++ b/prog/weave-kube/launch.sh @@ -61,7 +61,11 @@ if [ -n "$HOSTNAME" ] ; then NICKNAME_ARG="--nickname=$HOSTNAME" fi -BRIDGE_OPTIONS="--datapath=datapath" +router_bridge_opts() { + echo --datapath=datapath + [ -z "$WEAVE_MTU" ] || echo --mtu "$WEAVE_MTU" + [ -z "$WEAVE_NO_FASTDP" ] || echo --no-fastdp +} if [ -z "$KUBE_PEERS" ]; then if ! KUBE_PEERS=$(/home/weave/kube-peers) || [ -z "$KUBE_PEERS" ]; then @@ -105,7 +109,7 @@ post_start_actions() { post_start_actions & -/home/weave/weaver $EXTRA_ARGS --port=6783 $BRIDGE_OPTIONS \ +/home/weave/weaver $EXTRA_ARGS --port=6783 $(router_bridge_opts) \ --host-root=$HOST_ROOT \ --http-addr=$HTTP_ADDR --status-addr=$STATUS_ADDR --docker-api='' --no-dns \ --ipalloc-range=$IPALLOC_RANGE $NICKNAME_ARG \