From c77b2e8fb33b3f1841a6d3f9ab439480e7c5f195 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 7 Jun 2016 18:02:15 +0100
Subject: [PATCH] Tell the proxy that multicast is off in awsvpc mode.

Otherwise it will use the regular weavewait program which wait for the
multicast route to be added.
---
 weave | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/weave b/weave
index 419d9905..b09bd849 100755
--- a/weave
+++ b/weave
@@ -1689,6 +1689,8 @@ launch_proxy() {
        docker create -v /w -v /w-noop -v /w-nomcast --name=$VOLUMES_CONTAINER_NAME \
            --label=weavevolumes --entrypoint=/bin/false $EXEC_IMAGE >/dev/null
     fi
+    detect_awsvpc
+    [ -n "$AWSVPC" ] && PROXY_ARGS="$PROXY_ARGS --no-multicast-route"
     PROXY_CONTAINER=$(docker run -d --name=$PROXY_CONTAINER_NAME \
         $(docker_run_options) \
         $RESTART_POLICY \