Fix WEAVE_NO_FASTDP test on GCE

weaveworks · Feb 2, 2016 · 0e0d97b · 0e0d97b
1 parent 36e04fc
commit 0e0d97b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/test/190_no_fastdp_2_test.sh b/test/190_no_fastdp_2_test.sh
@@ -7,8 +7,8 @@ C2=10.2.1.47
 
 start_suite "WEAVE_NO_FASTDP operation"
 
-WEAVE_NO_FASTDP=1 WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch
-WEAVE_NO_FASTDP=1 WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST2 launch $HOST1
+WEAVE_NO_FASTDP=1 weave_on $HOST1 launch
+WEAVE_NO_FASTDP=1 weave_on $HOST2 launch $HOST1
 
 start_container $HOST1 $C1/24 --name=c1
 start_container $HOST2 $C2/24 --name=c2

diff --git a/test/gce.sh b/test/gce.sh
@@ -135,17 +135,14 @@ function make_template {
 
 function hosts {
 	hosts=
-	args=
 	json=$(mktemp json.XXXXXXXXXX)
 	gcloud compute instances list --format=json >$json
 	for name in $(vm_names); do
 		hostname="$name.$ZONE.$PROJECT"
 		hosts="$hostname $hosts"
-		args="--add-host=$hostname:$(internal_ip $json $name) $args"
 	done
 	echo export SSH=\"ssh -l vagrant\"
 	echo export HOSTS=\"$hosts\"
-	echo export ADD_HOST_ARGS=\"$args\"
 	rm $json
 }