From ab74d7b438f23a57738190db8addbcb7b7a5ec32 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 6 Jun 2016 15:39:19 +0100 Subject: [PATCH] Improve plugin multicast docs --- site/plugin.md | 9 ++------- site/plugin/plugin-how-it-works.md | 4 +++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/site/plugin.md b/site/plugin.md index bed54551..08a0ac08 100644 --- a/site/plugin.md +++ b/site/plugin.md @@ -22,7 +22,8 @@ After you've launched Weave Net and peered your hosts, you can start containers $ docker run --net=weave -ti ubuntu -on any of the hosts, and they can all communicate with each other. +on any of the hosts, and they can all communicate with each other +using any protocol, even multicast. >**Warning!** It is inadvisable to attach containers to the Weave network using the Weave Docker Networking Plugin and Weave Docker API Proxy simultaneously. Such containers will end up with two Weave network interfaces and two IP addresses, which is rarely desirable. To ensure that the proxy is not being used, do not run eval $(weave env), or docker $(weave config). @@ -91,12 +92,6 @@ The plugin command-line arguments are: how much information to emit for debugging. * `--no-restart` -- remove the default policy of `--restart=always`, if you want to control start-up of the plugin yourself - * `--no-multicast-route` -- stops weave from adding a static IP route for - multicast traffic onto its interface - -By default, multicast traffic is routed over the weave network. -To turn this off, e.g. you want to configure your own multicast -route, add the `--no-multicast-route` flag to `weave launch-plugin`. >Note: When using the Docker Plugin, there is no need to run `eval diff --git a/site/plugin/plugin-how-it-works.md b/site/plugin/plugin-how-it-works.md index b0561d05..54d9f26a 100644 --- a/site/plugin/plugin-how-it-works.md +++ b/site/plugin/plugin-how-it-works.md @@ -32,7 +32,9 @@ The plugin accepts the following options via `docker network create ... --opt`: route for multicast traffic onto its interface. >**Note:** If you connect a container to multiple Weave networks, at - most one of them can have the multicast route enabled. + most one of them can have the multicast route enabled. The `weave` + network created when the plugin is first launched has the multicast + option turned on, but for any networks you create it defaults to off. **See Also**