From 5b437d2199841eeecb295f873c22a51e989cd8a2 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 3 Sep 2015 11:04:35 +0100 Subject: [PATCH] Update docs for mixed manual and automatic IP allocation --- site/features.md | 8 ++++---- site/ipam.md | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/site/features.md b/site/features.md index 189f9365a1..8e4241d6cf 100644 --- a/site/features.md +++ b/site/features.md @@ -112,11 +112,11 @@ Similarly, in the container on $HOST2... round-trip min/avg/max/stddev = 1.034/1.034/1.034/0.000 ms The IP addresses and netmasks can be anything you like, but make sure -they don't conflict with any IP ranges in use on the hosts (including -those delegated to weave's [automatic IP address allocator](ipam.html)) or +they don't conflict with any IP ranges in use on the hosts or IP addresses of external services the hosts or containers need to -connect to. The same IP range must be used everywhere, and the -individual IP addresses must, of course, be unique. +connect to. The individual IP addresses given to containers must, of +course, be unique - if you pick an address that the automatic +allocator has already assigned you will receive a warning. ### Naming and discovery diff --git a/site/ipam.md b/site/ipam.md index 9d4a8b83c2..1fd5fd7c7f 100644 --- a/site/ipam.md +++ b/site/ipam.md @@ -159,9 +159,13 @@ symbolically with `net:default`. ## Mixing automatic and manual allocation -If you want to start containers with a mixture of -automatically-allocated addresses and manually-chosen addresses, *and -have the containers communicate with each other*, you can choose a +You can start containers with a mixture of automatically-allocated +addresses and manually-chosen addresses in the same range, but you may +find that the automatic allocator has already reserved a specific +address that you wanted. + +To reserve a range for manual allocation in the same subnet as the +automatic allocator, you can specify an `--ipalloc-range` that is smaller than `--ip-default-subnet`, For example, if you launch weave with: