From 4fa9dbbfe0aa680e0f31c348e638f2ee29b7cc73 Mon Sep 17 00:00:00 2001 From: Alexandre Beslic Date: Mon, 15 Jun 2015 17:36:34 -0700 Subject: [PATCH] lower ttl min for consul in integration tests Signed-off-by: Alexandre Beslic --- test/integration/discovery/consul.bats | 2 +- test/integration/discovery/consul/config/consul.json | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 test/integration/discovery/consul/config/consul.json diff --git a/test/integration/discovery/consul.bats b/test/integration/discovery/consul.bats index dcfdbf14a6..b883c2b39c 100644 --- a/test/integration/discovery/consul.bats +++ b/test/integration/discovery/consul.bats @@ -12,7 +12,7 @@ DISCOVERY="consul://${STORE_HOST}/test" CONTAINER_NAME=swarm_consul function start_store() { - docker_host run --name=$CONTAINER_NAME -h $CONTAINER_NAME -p $STORE_HOST:8500 -d progrium/consul -server -bootstrap-expect 1 -data-dir /test + docker_host run -v $(pwd)/discovery/consul/config:/config --name=$CONTAINER_NAME -h $CONTAINER_NAME -p $STORE_HOST:8500 -d progrium/consul -server -bootstrap-expect 1 -config-file=/config/consul.json } function stop_store() { diff --git a/test/integration/discovery/consul/config/consul.json b/test/integration/discovery/consul/config/consul.json new file mode 100644 index 0000000000..d87be8a254 --- /dev/null +++ b/test/integration/discovery/consul/config/consul.json @@ -0,0 +1,11 @@ +{ + "session_ttl_min": "1s", + "data_dir": "/data", + "ui_dir": "/ui", + "client_addr": "0.0.0.0", + "ports": { + "dns": 53 + }, + "recursor": "8.8.8.8", + "disable_update_check": true +}