From 8a305ee189f2ca973face055b5eaa906a5d0c8cc Mon Sep 17 00:00:00 2001 From: Anita Buehrle Date: Wed, 30 Mar 2016 17:05:26 -0600 Subject: [PATCH] fixes #2102 --- site/features.md | 6 +++--- site/systemd.md | 2 +- site/using-weave/host-network-integration.md | 4 ++-- .../automatic-discovery-proxy.md | 8 ++++---- site/weave-docker-api/set-up-proxy.md | 4 ++-- site/weavedns/how-works-weavedns.md | 18 +++++++++--------- site/weavedns/load-balance-fault-weavedns.md | 4 ++-- site/weavedns/managing-domains-weavedns.md | 2 +- site/weavedns/managing-entries-weavedns.md | 6 +++--- site/weavedns/overview-using-weavedns.md | 18 +++++++++--------- site/weavedns/troubleshooting-weavedns.md | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/site/features.md b/site/features.md index 740c78ab..a71ed469 100644 --- a/site/features.md +++ b/site/features.md @@ -120,16 +120,16 @@ For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Managemen ###Naming and Discovery -Named containers are automatically registered in [weavedns](/site/weavedns/overview-using-weavedns.md), +Named containers are automatically registered in [weaveDNS](/site/weavedns/overview-using-weavedns.md), and are discoverable by using standard, simple name lookups: host1$ docker run -dti --name=service ubuntu host1$ docker run -ti ubuntu root@7b21498fb103:/# ping service -`weavedns` also supports [load balancing](/site/weavedns/load-balance-fault-weavedns.md), [fault resilience](/site/weavedns/load-balance-fault-weavedns.md) and [hot swapping](/site/weavedns/managing-entries-weavedns.md). +WeaveDNS also supports [load balancing](/site/weavedns/load-balance-fault-weavedns.md), [fault resilience](/site/weavedns/load-balance-fault-weavedns.md) and [hot swapping](/site/weavedns/managing-entries-weavedns.md). -See [Naming and discovery with Weavedns](/site/weavedns/how-works-weavedns.md). +See [Naming and discovery with WeaveDNS](/site/weavedns/how-works-weavedns.md). ###Application Isolation diff --git a/site/systemd.md b/site/systemd.md index d5a471cc..b7cb0641 100644 --- a/site/systemd.md +++ b/site/systemd.md @@ -4,7 +4,7 @@ layout: default --- -Having installed `weave` as per [Installing Weave](/site/installing-weave.md), you might find it convenient to configure the +Having installed Weave Net as per [Installing Weave](/site/installing-weave.md), you might find it convenient to configure the init daemon to start Weave on boot. Most recent Linux distribution releases ship with [systemd](http://www.freedesktop.org/wiki/Software/systemd/). The information below provides you with some initial guidance on getting a Weave Net service configured on a systemd-based OS. ## Weave Net Service Unit and Configuration diff --git a/site/using-weave/host-network-integration.md b/site/using-weave/host-network-integration.md index 93fccf4d..14c4e864 100644 --- a/site/using-weave/host-network-integration.md +++ b/site/using-weave/host-network-integration.md @@ -31,9 +31,9 @@ Multiple subnet addresses can be exposed or hidden using a single command: host2$ weave hide net:default net:10.2.2.0/24 10.2.1.132 10.2.2.130 -###Adding Exposed Addresses to weavedns +###Adding Exposed Addresses to weaveDNS -Exposed addresses can also be added to `weavedns` by supplying fully qualified domain names: +Exposed addresses can also be added to weaveDNS by supplying fully qualified domain names: host2$ weave expose -h exposed.weave.local 10.2.1.132 diff --git a/site/weave-docker-api/automatic-discovery-proxy.md b/site/weave-docker-api/automatic-discovery-proxy.md index 78ab3f05..978dba66 100644 --- a/site/weave-docker-api/automatic-discovery-proxy.md +++ b/site/weave-docker-api/automatic-discovery-proxy.md @@ -3,12 +3,12 @@ title: Using Automatic Discovery With the Weave Net Proxy layout: default --- -Containers launched via the proxy use [weavedns](/site/weavedns/overview-using-weavedns.md) +Containers launched via the proxy use [weaveDNS](/site/weavedns/overview-using-weavedns.md) automatically if it is running when they are started - -see the [weavedns usage](/site/weavedns/overview-using-weavedns.md#usage) section for an in depth +see the [weaveDNS usage](/site/weavedns/overview-using-weavedns.md#usage) section for an in depth explanation of the behaviour and how to control it. -Typically, the proxy passes on container names as-is to weavedns +Typically, the proxy passes on container names as-is to weaveDNS for registration. However, there are situations in which the final container name may be out of your control (for example, if you are using Docker orchestrators which append control/namespacing identifiers to the original container names). @@ -35,7 +35,7 @@ For example, you can launch the proxy using all three flags, as follows: (for example, `$1`). For further details on the regular expression syntax see [Google's re2 documentation](https://github.com/google/re2/wiki/Syntax). -After launching the Weave Net proxy with these flags, running a container named `aws-12798186823-foo` without labels results in weavedns registering the hostname `my-app-foo` and not `aws-12798186823-foo`. +After launching the Weave Net proxy with these flags, running a container named `aws-12798186823-foo` without labels results in weaveDNS registering the hostname `my-app-foo` and not `aws-12798186823-foo`. host1$ docker run -ti --name=aws-12798186823-foo ubuntu ping my-app-foo PING my-app-foo.weave.local (10.32.0.2) 56(84) bytes of data. diff --git a/site/weave-docker-api/set-up-proxy.md b/site/weave-docker-api/set-up-proxy.md index 740bda04..13f7d8da 100644 --- a/site/weave-docker-api/set-up-proxy.md +++ b/site/weave-docker-api/set-up-proxy.md @@ -15,7 +15,7 @@ instead of `weave run`. The proxy sits between the Docker client (command line or API) and the Docker daemon, and intercepts the communication between the two. You can -start it simultaneously with the router and weavedns via `launch`: +start it simultaneously with the router and weaveDNS via `launch`: host1$ weave launch @@ -62,7 +62,7 @@ The proxy can be stopped independently with host1$ weave stop-proxy -or in conjunction with the router and weavedns via `stop`. +or in conjunction with the router and weaveDNS via `stop`. If you set your `DOCKER_HOST` to point at the proxy, you should revert to the original settings prior to stopping the proxy. diff --git a/site/weavedns/how-works-weavedns.md b/site/weavedns/how-works-weavedns.md index 93ef233c..87042b18 100644 --- a/site/weavedns/how-works-weavedns.md +++ b/site/weavedns/how-works-weavedns.md @@ -4,22 +4,22 @@ layout: default --- -The weavedns service running on every host acts as the nameserver for +The weaveDNS service running on every host acts as the nameserver for containers on that host. It learns about hostnames for local containers from the proxy and from the `weave run` command. -If a hostname is in the `.weave.local` domain, then weavedns records the association of that +If a hostname is in the `.weave.local` domain, then weaveDNS records the association of that name with the container's Weave Net IP address(es) in its in-memory database, and then broadcasts the association to other Weave Net peers in the cluster. -When weavedns is queried for a name in the `.weave.local` domain, it +When weaveDNS is queried for a name in the `.weave.local` domain, it looks up the hostname in its memory database and responds with the IPs of all containers for that hostname across the entire cluster. ###Basic Load Balancing and Fault Tolerance -Weavedns returns IP addresses in random order to facilitate basic +WeaveDNS returns IP addresses in random order to facilitate basic load balancing and failure tolerance. Most client side resolvers sort the returned addresses based on reachability, and place local addresses at the top of the list (see [RFC 3484](https://www.ietf.org/rfc/rfc3484.txt)). @@ -29,14 +29,14 @@ machine, the application receives that container's IP address. Otherwise, the application receives the IP address of a random container with the desired hostname. -When weavedns is queried for a name in a domain other than +When weaveDNS is queried for a name in a domain other than `.weave.local`, it queries the host's configured nameserver, which is the standard behaviour for Docker containers. ###Specifying a Different Docker Bridge Device So that containers can connect to a stable and always routable IP -address, weavedns listens on port 53 to the Docker bridge device, which +address, weaveDNS listens on port 53 to the Docker bridge device, which is assumed to be `docker0`. Some configurations may use a different Docker bridge device. To supply a different bridge device, use the environment variable `DOCKER_BRIDGE`, e.g., @@ -45,7 +45,7 @@ environment variable `DOCKER_BRIDGE`, e.g., $ sudo DOCKER_BRIDGE=someother weave launch ``` -In the event that weavedns is launched in this way, it's important that +In the event that weaveDNS is launched in this way, it's important that other calls to `weave` also specify the bridge device: ```bash @@ -54,6 +54,6 @@ $ sudo DOCKER_BRIDGE=someother weave run ... **See Also** - * [Using Weavedns](/site/weavedns/overview-using-weavedns.md) - * [Load Balancing with weavedns](/site/weavedns/load-balance-fault-weavedns.md) + * [Using WeaveDNS](/site/weavedns/overview-using-weavedns.md) + * [Load Balancing with weaveDNS](/site/weavedns/load-balance-fault-weavedns.md) * [Managing Domain Entries](/site/weavedns/managing-domains-weavedns.md) diff --git a/site/weavedns/load-balance-fault-weavedns.md b/site/weavedns/load-balance-fault-weavedns.md index 33babe63..8be3dab8 100644 --- a/site/weavedns/load-balance-fault-weavedns.md +++ b/site/weavedns/load-balance-fault-weavedns.md @@ -1,12 +1,12 @@ --- -title: Load Balancing and Fault Resilience with weavedns +title: Load Balancing and Fault Resilience with weaveDNS layout: default --- It is permissible to register multiple containers with the same name: -weavedns returns all addresses, in a random order, for each request. +weaveDNS returns all addresses, in a random order, for each request. This provides a basic load balancing capability. Expanding the diff --git a/site/weavedns/managing-domains-weavedns.md b/site/weavedns/managing-domains-weavedns.md index 85aa1b5b..4b232a4f 100644 --- a/site/weavedns/managing-domains-weavedns.md +++ b/site/weavedns/managing-domains-weavedns.md @@ -47,5 +47,5 @@ link-local as per [RFC6762](https://tools.ietf.org/html/rfc6762), * [How Weave Finds Containers](/site/weave-docker-api/how-works-weavedns.md) - * [Load Balancing and Fault Resilience with weavedns](/site/weave-docker-api/load-balance-fault-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/weave-docker-api/load-balance-fault-weavedns.md) * [Managing Domain Entries](/site/weavedns/managing-entries-weavedns.md) diff --git a/site/weavedns/managing-entries-weavedns.md b/site/weavedns/managing-entries-weavedns.md index 3331fe96..d5ce62a2 100644 --- a/site/weavedns/managing-entries-weavedns.md +++ b/site/weavedns/managing-entries-weavedns.md @@ -7,7 +7,7 @@ layout: default The following topics are discussed: * [Adding and removing extra DNS entries](#add-remove) -* [Resolving Weavedns entries from the Host](#resolve-weavedns-entries-from-host) +* [Resolving WeaveDNS entries from the Host](#resolve-weavedns-entries-from-host) * [Hot-swapping Service Containers](#hot-swapping) * [Retaining DNS Entries When Containers Stop](#retain-stopped) * [Configuring a Custom TTL](#ttl) @@ -48,7 +48,7 @@ $ weave dns-add 192.128.16.45 -h db.weave.local Note that such records get removed when stopping the weave peer on which they were added. -### Resolving Weavedns Entries From the Host +### Resolving WeaveDNS Entries From the Host You can resolve entries from any host running weaveDNS with `weave dns-lookup`: @@ -83,5 +83,5 @@ weaveDNS instance will receive. **See Also** * [How Weave Finds Containers](/site/weave-docker-api/how-works-weavedns.md) - * [Load Balancing and Fault Resilience with weavedns](/site/weave-docker-api/load-balance-fault-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/weave-docker-api/load-balance-fault-weavedns.md) * [Managing Domains](/site/weavedns/managing-domains-weavedns.md) diff --git a/site/weavedns/overview-using-weavedns.md b/site/weavedns/overview-using-weavedns.md index 57f257ff..635e628d 100644 --- a/site/weavedns/overview-using-weavedns.md +++ b/site/weavedns/overview-using-weavedns.md @@ -1,5 +1,5 @@ --- -title: Using Weavedns +title: Using WeaveDNS layout: default --- @@ -10,7 +10,7 @@ the containers hostnames and then tell other containers to connect to those name Unlike Docker 'links', this requires no code changes and it works across hosts. -Weavedns is deployed as an embedded service within the Weave router. +WeaveDNS is deployed as an embedded service within the Weave router. The service is automatically started when the router is launched: ```bash @@ -18,12 +18,12 @@ host1$ weave launch host1$ eval $(weave env) ``` -Weavedns related configuration arguments can be passed to `launch`. +WeaveDNS related configuration arguments can be passed to `launch`. -Application containers use weavedns automatically if it is +Application containers use weaveDNS automatically if it is running when they are started. They use it for name resolution, and will register themselves if they either have a -hostname in the weavedns domain (`weave.local` by default) or are given an explicit container name: +hostname in the weaveDNS domain (`weave.local` by default) or are given an explicit container name: ```bash host1$ docker run -dti --name=pingme ubuntu @@ -34,14 +34,14 @@ root@ubuntu:/# ping pingme > **Note** If both hostname and container name are specified at the same time, the hostname takes precedence. In this circumstance, if -the hostname is not in the weavedns domain, the container is *not* -registered, but it will still use weavedns for resolution. +the hostname is not in the weaveDNS domain, the container is *not* +registered, but it will still use weaveDNS for resolution. -To disable an application container's use of weavedns, add the +To disable an application container's use of weaveDNS, add the `--without-dns` option to `weave run` or `weave launch-proxy`. To disable weaveDNS itself, launch weave with the `--no-dns` option. **See Also** * [How Weave Finds Containers](/site/weave-docker-api/how-works-weavedns.md) - * [Load Balancing and Fault Resilience with weavedns](/site/weave-docker-api/load-balance-fault-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/weave-docker-api/load-balance-fault-weavedns.md) diff --git a/site/weavedns/troubleshooting-weavedns.md b/site/weavedns/troubleshooting-weavedns.md index 533d9e92..16009916 100644 --- a/site/weavedns/troubleshooting-weavedns.md +++ b/site/weavedns/troubleshooting-weavedns.md @@ -28,7 +28,7 @@ DNS: The first section covers the router; see the [troubleshooting guide](/site/troubleshooting.md#weave-status) for more details. -The 'Service: dns' section is pertinent to weavedns, and includes: +The 'Service: dns' section is pertinent to weaveDNS, and includes: * The local domain suffix which is being served * The list of upstream servers used for resolving names not in the local domain