Merge pull request #1048 from squaremo/issue1040_eliminate_ipam_mentions

Remove references to 'IPAM' in docs and UI

Closes #1040.

prog/weaveproxy/main.go

@@ -26,7 +26,8 @@ func main() {
 	getopt.BoolVarLong(&debug, "debug", 'd', "log debugging information")
 	getopt.BoolVarLong(&justVersion, "version", 0, "print version and exit")
 	getopt.ListVar(&c.ListenAddrs, 'H', fmt.Sprintf("address on which to listen (default %s)", defaultListenAddrs))
-	getopt.BoolVarLong(&c.NoDefaultIPAM, "no-default-ipam", 0, "do not automatically allocate addresses for containers without a WEAVE_CIDR")
+	getopt.BoolVarLong(&c.NoDefaultIPAM, "no-default-ipalloc", 0, "do not automatically allocate addresses for containers without a WEAVE_CIDR")
+	getopt.BoolVarLong(&c.NoDefaultIPAM, "no-default-ipam", 0, "do not automatically allocate addresses for containers without a WEAVE_CIDR (deprecated; please use --no-default-ipalloc")
 	getopt.StringVarLong(&c.TLSConfig.CACert, "tlscacert", 0, "Trust certs signed only by this CA")
 	getopt.StringVarLong(&c.TLSConfig.Cert, "tlscert", 0, "Path to TLS certificate file")
 	getopt.BoolVarLong(&c.TLSConfig.Enabled, "tls", 0, "Use TLS; implied by --tlsverify")

site/proxy.md

@@ -110,18 +110,18 @@ To start a container without connecting it to the weave network, pass
 
     host1$ docker run -ti -e WEAVE_CIDR=none ubuntu
 
-If you do not want IPAM to be used by default, the proxy needs to be
-passed the `--no-default-ipam` flag, e.g.
+If you do not want an IP to be assigned by default, the proxy needs to
+be passed the `--no-default-ipalloc` flag, e.g.,
 
-    host1$ docker launch-proxy --no-default-ipam
+    host1$ docker launch-proxy --no-default-ipalloc
 
 In this configuration, containers with no `WEAVE_CIDR` environment
 variable will not be connected to the weave network. Containers
 started with a `WEAVE_CIDR` environment variable are handled as
 before. To automatically assign an address in this mode, we start the
 container with a blank `WEAVE_CIDR`, e.g.
 
-    host1$ docker run -ti -e WEAVE_CIDR= ubuntu
+    host1$ docker run -ti -e WEAVE_CIDR="" ubuntu
 
 ## <a name="dns"></a>Automatic discovery
 
@@ -186,7 +186,7 @@ containers on the weave network with `weave run`:
 The arguments after `run` are passed through to `docker run` so you
 can freely specify whichever docker options are appropriate. Once the
 container is started, `weave run` attaches it to the weave network, in
-this example with an address allocated by IPAM. If you wish you can
+this example with an automatically allocated IP. If you wish you can
 specify addresses manually instead:
 
     $ weave run 10.2.1.1/24 -ti ubuntu

site/weavedns.md

@@ -72,10 +72,10 @@ detection of the weaveDNS container.
 Each weaveDNS container started with `launch-dns` needs its own unique
 IP address in a subnet that is common to all weaveDNS containers. In
 the example above we did not specify such an address, so one was
-allocated automatically by IPAM from the default subnet; you can
-however specify an address in CIDR format manually. In this case you
-are responsible for ensuring that the IP addresses specified are
-uniquely allocated and not in use by any other container.
+allocated automatically from the default subnet; you can however
+specify an address in CIDR format manually. In this case you are
+responsible for ensuring that the IP addresses specified are uniquely
+allocated and not in use by any other container.
 
 Finally, weaveDNS can be stopped independently with
 

test/600_proxy_docker_py_test.sh

@@ -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 \

test/660_proxy_ipam_test.sh

@@ -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

weave

@@ -34,7 +34,7 @@ usage() {
     echo "                        [-initpeercount <count>] <peer> ..."
     echo "weave launch-dns    [<addr>]"
     echo "weave launch-proxy  [-H <endpoint>] [--with-dns | --without-dns]"
-    echo "                        [--no-default-ipam]"
+    echo "                        [--no-default-ipalloc]"
     echo "weave connect       [--replace] [<peer> ...]"
     echo "weave forget        <peer> ..."
     echo "weave run           [--with-dns | --without-dns] [<addr> ...]"