proxy needs to add weavewait to execs as well

Bug came up in a test where we are restarting and doing an exec checking
a network interface right away. weavewait is only added if the container
has a WEAVE_CIDR var set, the same as at container creation.
This commit is contained in:
Paul Bellamy committed 2015-05-19 17:36:53 +01:00
1 parent 70b595c4a2
commit e6b587ea8d
7 files changed
+106 -18

No files matched your search

+1 -1
View File
@@ -14,7 +14,7 @@ docker_proxy_on $HOST1 run -e WEAVE_CIDR=$C2/24 -dt --name=c2 -h $NAME gliderlab
docker_proxy_on $HOST1 run -e WEAVE_CIDR=$C1/24 -dt --name=c1 aanand/docker-dnsutils /bin/sh
docker_proxy_on $HOST1 restart c2
assert_raises "exec_on $HOST1 c2 ip link show ethwe | grep 'state UP'"
assert_raises "proxy_exec_on $HOST1 c2 ip link show ethwe | grep 'state \\(UP\\|UNKNOWN\\)'"
assert_dns_record $HOST1 c1 $NAME $C2
end_suite
+8
View File
@@ -97,6 +97,14 @@ exec_on() {
docker -H tcp://$host:2375 exec $container "$@"
}
proxy_exec_on() {
host=$1
container=$2
shift 2
docker -H tcp://$host:12375 exec $container "$@"
}
start_container() {
host=$1
shift 1