Proxy support for IPAM

Pass `-e WEAVE_CIDR=` to your container to use IPAM. If IPAM is not
enabled on the weave router, the container will be booted without weave
networking.

I'm not crazy about adding *another* undocumented weave cli command
(ipam-cidr), but it saves the proxy messing around finding container
IPs.
This commit is contained in:
Paul Bellamy committed 2015-05-21 15:37:37 +01:00
1 parent 22b8f482ea
commit 46bdd8c67d
5 files changed
+37 -2

No files matched your search

+19
View File
@@ -0,0 +1,19 @@
#! /bin/bash
. ./config.sh
UNIVERSE=10.2.2.0/24
start_suite "Ping proxied containers over cross-host weave network (with IPAM)"
weave_on $HOST1 launch -iprange $UNIVERSE
weave_on $HOST1 launch-proxy
weave_on $HOST2 launch -iprange $UNIVERSE $HOST1
weave_on $HOST2 launch-proxy
proxy_start_container $HOST1 -e WEAVE_CIDR= --name=c1
proxy_start_container $HOST2 -e WEAVE_CIDR= --name=c2
C2=$(container_ip $HOST2 c2)
assert_raises "exec_on $HOST1 c1 $PING $C2"
end_suite
+6
View File
@@ -112,6 +112,12 @@ start_container() {
weave_on $host run "$@" -t gliderlabs/alpine /bin/sh
}
proxy_start_container() {
host=$1
shift 1
docker -H tcp://$host:12375 run "$@" -dt gliderlabs/alpine /bin/sh
}
start_container_with_dns() {
host=$1
shift 1