Merge pull request #1972 from weaveworks/persist-peers

Persist set of peers to connect to

test/162_persist_ipam_2_test.sh

@@ -14,7 +14,7 @@ launch_router_with_db() {
 run_on $HOST1 "sudo rm -f /tmp/test162-*"
 run_on $HOST2 "sudo rm -f /tmp/test162-*"
 
-launch_router_with_db $HOST1
+launch_router_with_db $HOST1 $HOST2
 launch_router_with_db $HOST2 $HOST1
 
 start_container $HOST1 --name=c1
@@ -31,13 +31,8 @@ start_container $HOST2 --name=c3
 C3=$(container_ip $HOST2 c3)
 assert_raises "[ $C3 != $C1 ]"
 
-stop_router_on $HOST2
-
-# Now start HOST1 with HOST2 down and see if it hangs when we launch a container
-launch_router_with_db $HOST1 $HOST2
-start_container $HOST1 --name=c4
-C4=$(container_ip $HOST1 c4)
-assert_raises "[ $C4 != $C1 ]"
-assert_raises "[ $C4 != $C3 ]"
+# Restart HOST1 and see if it remembers to connect to HOST2
+launch_router_with_db $HOST1
+assert_raises "exec_on $HOST2 c2 $PING $C1"
 
 end_suite