diff --git a/plugin/plugin.go b/plugin/plugin.go index 70876c04..48ba067f 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -20,7 +20,7 @@ import ( var Log = common.Log -func Start(weaveAPIAddr string, dockerAPIAddr string, address string, meshAddress string, noMulticastRoute bool) { +func Start(weaveAPIAddr string, dockerAPIAddr string, address string, meshAddress string) { weave := weaveapi.NewClient(weaveAPIAddr, Log) var dockerClient *docker.Client @@ -33,9 +33,6 @@ func Start(weaveAPIAddr string, dockerAPIAddr string, address string, meshAddres } } - if noMulticastRoute { - Log.Warning("--no-multicast-route option has been removed; multicast is off by default") - } if dockerClient == nil { Log.Info("Running without Docker API connection") } else { diff --git a/prog/weaver/main.go b/prog/weaver/main.go index d1b1515b..ba38d666 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -153,7 +153,6 @@ func main() { advertiseAddress string pluginSocket string pluginMeshSocket string - noMulticastRoute bool enablePlugin bool defaultDockerHost = "unix:///var/run/docker.sock" @@ -203,7 +202,6 @@ func main() { mflag.BoolVar(&enablePlugin, []string{"-plugin"}, false, "enable Docker plugin") mflag.StringVar(&pluginSocket, []string{"-plugin-socket"}, "/run/docker/plugins/weave.sock", "plugin socket on which to listen") mflag.StringVar(&pluginMeshSocket, []string{"-plugin-mesh-socket"}, "/run/docker/plugins/weavemesh.sock", "plugin socket on which to listen in mesh mode") - mflag.BoolVar(&noMulticastRoute, []string{"-no-multicast-route"}, false, "deprecated (this is now the default)") // crude way of detecting that we probably have been started in a // container, with `weave launch` --> suppress misleading paths in @@ -407,8 +405,7 @@ func main() { } if enablePlugin { - // TODO(mp) do not pass pluginMeshSocket if plugin-v2 is in use - go plugin.Start(httpAddr, dockerAPI, pluginSocket, pluginMeshSocket, noMulticastRoute) + go plugin.Start(httpAddr, dockerAPI, pluginSocket, pluginMeshSocket) } signals.SignalHandlerLoop(common.Log, router) diff --git a/weave b/weave index 0553197d..56992ff8 100755 --- a/weave +++ b/weave @@ -49,7 +49,7 @@ weave launch [--no-restart] [--resume] [--no-discovery] [--no-dns] [--ipalloc-init ] [--ipalloc-range [--ipalloc-default-subnet ]] - [--plugin [--no-multicast-route]] + [--plugin] [--log-level=debug|info|warning|error] ... launch-proxy [-H ] [--without-dns] [--no-multicast-route]