From b747468a2fc3e8f5544046706e0e267ab58856ba Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Thu, 6 Feb 2014 18:01:37 -0800 Subject: [PATCH] fix(etcd-bootstrap): Use higher election timeout on EC2 --- .../third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap index 690834309a..38d442cfee 100755 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap @@ -10,6 +10,8 @@ ARGS="-f -data-dir $STATE -bind-addr 0.0.0.0" if [ "${VIRT}" != "ec2" ]; then echo "Detected environment \"${VIRT}\", just starting solo master..." exec /usr/bin/etcd ${ARGS} -n ${HOSTNAME} +else + ARGS="${ARGS} -peer-election-timeout 1200" fi BOOTSTRAP_PEERS="/var/run/etcd/bootstrap.config"