Merge pull request #2663 from carmstrong/revert-etcd_timeout

Revert "fix(coreos): tune etcd to address high disk i/o environments"

Author: Gabriel Monroy

contrib/coreos/user-data.example

@@ -8,15 +8,15 @@ coreos:
     addr: $private_ipv4:4001
     peer-addr: $private_ipv4:7001
     # give etcd more time if it's under heavy load - prevent leader election thrashing
-    peer-election-timeout: 5000
+    peer-election-timeout: 2000
     # heartbeat interval should ideally be 1/4 or 1/5 of peer election timeout
-    peer-heartbeat-interval: 1000
+    peer-heartbeat-interval: 500
   fleet:
     # We have to set the public_ip here so this works on Vagrant -- otherwise, Vagrant VMs
     # will all publish the same private IP. This is harmless for cloud providers.
     public-ip: $private_ipv4
     # allow etcd to slow down at times
-    etcd_request_timeout: 5
+    etcd_request_timeout: 3
   units:
   - name: etcd.service
     command: start