Handle --awsvpc implies --no-multicast-route in Go code

prog/weaver/main.go

@@ -218,6 +218,9 @@ func main() {
 	mflag.StringVar(&pluginMeshSocket, []string{"-plugin-mesh-socket"}, "/run/docker/plugins/weavemesh.sock", "plugin socket on which to listen in mesh mode")
 
 	proxyConfig := configureProxy(version, defaultDockerHost)
+	if bridgeConfig.AWSVPC {
+		proxyConfig.NoMulticastRoute = true
+	}
 
 	// crude way of detecting that we probably have been started in a
 	// container, with `weave launch` --> suppress misleading paths in

weave

@@ -1282,10 +1282,6 @@ launch() {
             --no-restart)
                 RESTART_POLICY=
                 ;;
-            --awsvpc)
-                AWSVPC_ARGS="--awsvpc"
-                AWSVPC=1
-                ;;
             --plugin)
                 PLUGIN_ARGS="--plugin"
                 ENABLE_PLUGIN=1
@@ -1348,7 +1344,6 @@ launch() {
        docker create -v /w -v /w-noop -v /w-nomcast --name=$VOLUMES_CONTAINER_NAME \
            --label=weavevolumes --entrypoint=/bin/false $EXEC_IMAGE >/dev/null
     fi
-    [ -n "$AWSVPC" ] && PROXY_ARGS="$PROXY_ARGS --no-multicast-route"
 
     # Set WEAVE_DOCKER_ARGS in the environment in order to supply
     # additional parameters, such as resource limits, to docker
@@ -1380,7 +1375,6 @@ launch() {
         --ipalloc-range "$IPRANGE" \
         --dns-effective-listen-address $DOCKER_BRIDGE_IP \
         $DNS_ROUTER_OPTS $NO_DNS_OPT \
-        $AWSVPC_ARGS \
         $PLUGIN_ARGS \
         --http-addr $HTTP_ADDR \
         --status-addr $STATUS_ADDR \