From 499d6312b7e6159ab94c116127b9c020fe109118 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 6 Nov 2015 10:02:19 +0000 Subject: [PATCH] Don't need --add-host except in non-FDP case because we put the mappings in the outer /etc/hosts --- test/190_no_fastdp_2_test.sh | 4 ++-- test/gce.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/190_no_fastdp_2_test.sh b/test/190_no_fastdp_2_test.sh index fe793f2b..18d235fc 100755 --- 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_on $HOST1 launch -WEAVE_NO_FASTDP=1 weave_on $HOST2 launch $HOST1 +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 start_container $HOST1 $C1/24 --name=c1 start_container $HOST2 $C2/24 --name=c2 diff --git a/test/gce.sh b/test/gce.sh index b83f5198..b1cc7cca 100755 --- a/test/gce.sh +++ b/test/gce.sh @@ -142,7 +142,7 @@ function hosts { done echo export SSH=ssh echo export HOSTS=\"$hosts\" - echo export WEAVE_DOCKER_ARGS=\"$args\" + echo export ADD_HOST_ARGS=\"$args\" rm $json }