From 11c368531a85f5de0f17f0b80794645c5c9d121b Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 3 May 2016 16:14:31 +0100 Subject: [PATCH 1/3] Add --log-level to weave usage message, and document it and a couple of other options on the proxy. --- site/weave-docker-api/using-proxy.md | 7 +++++++ weave | 3 +++ 2 files changed, 10 insertions(+) diff --git a/site/weave-docker-api/using-proxy.md b/site/weave-docker-api/using-proxy.md index 3d578bb7..17d66be9 100644 --- a/site/weave-docker-api/using-proxy.md +++ b/site/weave-docker-api/using-proxy.md @@ -53,6 +53,13 @@ By default, multicast traffic is routed over the Weave network. To turn this off, for example, because you want to configure your own multicast route, add the `--no-multicast-route` flag to `weave launch-proxy`. +###Other Weave Proxy options + + * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/weavedns.md) + * `--log-level=debug|info|warning|error` -- controls 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 proxy yourself. **See Also** diff --git a/weave b/weave index 53ca7ec0..3662412f 100755 --- a/weave +++ b/weave @@ -41,17 +41,20 @@ weave --help | help weave launch launch-router [--password ] [--name ] [--nickname ] + [--log-level=debug|info|warning|error] [--no-restart] [--ipalloc-init ] [--ipalloc-range [--ipalloc-default-subnet ]] [--no-discovery] [--no-dns] [--trusted-subnets ,...] ... launch-proxy [-H ] [--without-dns] [--no-multicast-route] + [--log-level=debug|info|warning|error] [--no-rewrite-hosts] [--no-default-ipalloc] [--no-restart] [--hostname-from-label ] [--hostname-match ] [--hostname-replacement ] [--rewrite-inspect] launch-plugin [--no-restart] [--no-multicast-route] + [--log-level=debug|info|warning|error] weave prime From 12fa345d109ab3f4c5358976c99e2710360ef32a Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 6 May 2016 11:10:34 +0100 Subject: [PATCH 2/3] Punctuation --- site/weave-docker-api/using-proxy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/weave-docker-api/using-proxy.md b/site/weave-docker-api/using-proxy.md index 17d66be9..cbccc57e 100644 --- a/site/weave-docker-api/using-proxy.md +++ b/site/weave-docker-api/using-proxy.md @@ -57,9 +57,9 @@ route, add the `--no-multicast-route` flag to `weave launch-proxy`. * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/weavedns.md) * `--log-level=debug|info|warning|error` -- controls how much - information to emit for debugging. + information to emit for debugging * `--no-restart` -- remove the default policy of `--restart=always`, if - you want to control start-up of the proxy yourself. + you want to control start-up of the proxy yourself **See Also** From e16a4aa97acefd240da5eea24ae257eeff5fecda Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 26 Apr 2016 15:26:12 +0100 Subject: [PATCH 3/3] Document adding a route on non-Weave hosts --- site/faq.md | 4 ++-- site/using-weave/host-network-integration.md | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/site/faq.md b/site/faq.md index 9f26a97f..77a3a5e0 100644 --- a/site/faq.md +++ b/site/faq.md @@ -31,9 +31,9 @@ Yes you can. For example, you have a Weave network that runs on hosts A, B, C. and you have an additional host, that we'll call P, where neither Weave nor Docker are running. However, you need to connect from a process running on host P to a specific container running on host B on the Weave network. Since the Weave network is completely separate from any network that P is connected to, you cannot connect the container using the container's IP address. -The simplest way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. See [Integrating a Network Host](/site/using-weave/host-network-integration.md) If this is not possible, you could also expose a port on the container on host B and then connect to it. +A simple way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. Or you set up a route from P to one of A, B or C. See [Integrating a Network Host](/site/using-weave/host-network-integration.md). -You can read about exposing ports in [Exporting Services](/site/using-weave/service-management.md#exporting). +Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/using-weave/service-management.md#exporting). **Q: Why am I seeing the same IP address assigned to two different containers on different hosts?** diff --git a/site/using-weave/host-network-integration.md b/site/using-weave/host-network-integration.md index 1babde48..b5dd48b4 100644 --- a/site/using-weave/host-network-integration.md +++ b/site/using-weave/host-network-integration.md @@ -38,8 +38,25 @@ Exposed addresses can also be added to weaveDNS by supplying fully qualified dom host2$ weave expose -h exposed.weave.local 10.2.1.132 +###Routing from Another Host + +After running `weave expose`, you can use Linux routing to provide +access to the Weave network from hosts that are not running Weave Net: + + ip route add via + +Where, + * `` is an IP address range in use on Weave Net, +for example, `10.2.0.0/16` or `10.32.0.0/12` and, + * `` is the address of the machine on which you ran `weave expose`. + +>**Note:** You must ensure that the [IP subnet used by Weave +Net](/site/ipam.md#range) does not clash with anything on those other +hosts. + **See Also** * [Using Weave Net](/site/using-weave.md) + * [General information on IP Addresses, Routes and Networks](/site/how-it-works/ip-addresses.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md)