diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh index 7a55a777..26a7f4fe 100755 --- a/prog/weave-kube/launch.sh +++ b/prog/weave-kube/launch.sh @@ -5,6 +5,7 @@ set -e # Default if not supplied - same as weave net default IPALLOC_RANGE=${IPALLOC_RANGE:-10.32.0.0/12} HTTP_ADDR=${WEAVE_HTTP_ADDR:-127.0.0.1:6784} +STATUS_ADDR=${WEAVE_STATUS_ADDR:-0.0.0.0:6782} # Default for network policy EXPECT_NPC=${EXPECT_NPC:-1} @@ -86,7 +87,7 @@ if [ -z "$IPALLOC_INIT" ]; then fi /home/weave/weaver --port=6783 $BRIDGE_OPTIONS \ - --http-addr=$HTTP_ADDR --docker-api='' --no-dns \ + --http-addr=$HTTP_ADDR --status-addr=$STATUS_ADDR --docker-api='' --no-dns \ --ipalloc-range=$IPALLOC_RANGE $NICKNAME_ARG \ --ipalloc-init $IPALLOC_INIT \ --name=$(cat /sys/class/net/weave/address) "$@" \ diff --git a/weave b/weave index f82f9ccd..9e792761 100755 --- a/weave +++ b/weave @@ -157,6 +157,7 @@ exec_remote() { -e WEAVE_PASSWORD \ -e WEAVE_PORT \ -e WEAVE_HTTP_ADDR \ + -e WEAVE_STATUS_ADDR \ -e WEAVE_CONTAINER_NAME \ -e WEAVE_MTU \ -e WEAVE_NO_FASTDP \ @@ -351,6 +352,7 @@ DATAPATH_IFNAME=v${CONTAINER_IFNAME}-datapath PCAP_IFNAME=v${CONTAINER_IFNAME}-pcap PORT=${WEAVE_PORT:-6783} HTTP_ADDR=${WEAVE_HTTP_ADDR:-127.0.0.1:6784} +STATUS_ADDR=${WEAVE_STATUS_ADDR:-127.0.0.1:6782} PROXY_PORT=12375 PROXY_CONTAINER_NAME=weaveproxy COVERAGE_ARGS="" @@ -1663,6 +1665,7 @@ launch_router() { $DNS_ROUTER_OPTS $NO_DNS_OPT \ $AWSVPC_ARGS \ --http-addr $HTTP_ADDR \ + --status-addr $STATUS_ADDR \ --resolv-conf "/var/run/weave/etc/$RESOLV_CONF_BASE" \ "$@") wait_for_status $CONTAINER_NAME http_call $HTTP_ADDR