From 937d9c3ef890ef060b57d2b4d241c1fc76923e6d Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 13 Jan 2015 12:46:27 +0000 Subject: [PATCH] rely un weavetools for testing ...rather than installing ethtool and conntrack Forgot to do this as part of #309. --- test/Vagrantfile | 2 +- test/setup.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/Vagrantfile b/test/Vagrantfile index 2ab3a111..0bdfa750 100644 --- a/test/Vagrantfile +++ b/test/Vagrantfile @@ -4,7 +4,7 @@ host1_ip = "192.168.48.19" # arbitrary private IP host2_ip = "192.168.48.15" # arbitrary private IP def configure_docker(host, ip) - pkgs = "lxc-docker ethtool conntrack" + pkgs = "lxc-docker" host.vm.box = "phusion/ubuntu-14.04-amd64" host.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/latest/ubuntu-14.04-amd64-vbox.box" diff --git a/test/setup.sh b/test/setup.sh index 98d20257..ee66c2bb 100755 --- a/test/setup.sh +++ b/test/setup.sh @@ -11,6 +11,7 @@ echo Copying weave images and script to hosts for HOST in $HOST1 $HOST2; do docker_on $HOST load -i /var/tmp/weave.tar docker_on $HOST load -i /var/tmp/weavedns.tar + docker_on $HOST load -i /var/tmp/weavetools.tar run_on $HOST mkdir -p `dirname $WEAVE` cat ../weave | run_on $HOST sh -c "cat > $WEAVE" cat ../bin/docker-ns | run_on $HOST sh -c "cat > $DOCKER_NS"