Remove references to 'IPAM' in docs and UI
The option `--no-default-ipam` is replaced with `--no-default-ipalloc`; the former will still work (in a 'last one wins' way), but its usage message says it's deprecated.
This commit is contained in:
1 parent
8e629d9471
commit
c0b2fe3e3b
6 files changed
+14
-13
No files matched your search
@@ -6,7 +6,7 @@ start_suite "Run docker-py test suite against the proxy"
|
||||
|
||||
docker_on $HOST1 pull joffrey/docker-py >/dev/null
|
||||
|
||||
weave_on $HOST1 launch-proxy --no-default-ipam
|
||||
weave_on $HOST1 launch-proxy --no-default-ipalloc
|
||||
|
||||
if docker_on $HOST1 run \
|
||||
-e NOT_ON_HOST=true \
|
||||
|
||||
@@ -20,7 +20,7 @@ start_suite "Ping proxied containers over cross-host weave network (with IPAM)"
|
||||
weave_on $HOST1 launch-router -iprange $UNIVERSE
|
||||
weave_on $HOST2 launch-router -iprange $UNIVERSE $HOST1
|
||||
weave_on $HOST1 launch-proxy
|
||||
weave_on $HOST2 launch-proxy --no-default-ipam
|
||||
weave_on $HOST2 launch-proxy --no-default-ipalloc
|
||||
|
||||
start $HOST1 --name=auto
|
||||
start $HOST1 --name=none -e WEAVE_CIDR=none
|
||||
|
||||
Reference in new issue
Block a user