From 12de13c678c1cc56ad215252e68b625e1c703da4 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 12 Jun 2015 15:15:36 +0100 Subject: [PATCH] Use /10 instead of /9 for default iprange, so it doesn't clash with CircleCI address --- site/ipam.md | 4 ++-- weave | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/ipam.md b/site/ipam.md index da54df9f..eff86c0d 100644 --- a/site/ipam.md +++ b/site/ipam.md @@ -27,7 +27,7 @@ You can see which address was allocated with [`weave ps`](troubleshooting.html#list-attached-containers): host1# weave ps $C - a7aff7249393 7a:51:d1:09:21:78 10.128.0.1/9 + a7aff7249393 7a:51:d1:09:21:78 10.128.0.1/10 Weave detects when a container has exited and releases its automatically allocated addresses so they can be re-used. @@ -68,7 +68,7 @@ time, you can give the number of peers like this: ## Choosing an allocation range -By default, weave will allocate IP addresses in the 10.128.0.0/9 +By default, weave will allocate IP addresses in the 10.128.0.0/10 range. This can be overridden with the `-iprange` option, e.g. host1# weave launch -iprange 10.2.0.0/16 diff --git a/weave b/weave index c0d16176..de3e4a89 100755 --- a/weave +++ b/weave @@ -985,7 +985,7 @@ case "$COMMAND" in done eval "set -- $ARGS" if [ -z "$IPRANGE" ] ; then - IPRANGE="-iprange 10.128.0.0/9" + IPRANGE="-iprange 10.128.0.0/10" if command_exists netcheck && ! netcheck ${IPRANGE#* } ; then echo "Default" $IPRANGE "overlaps with existing route." >&2 echo "Please pick another range and set it on all hosts." >&2