Skip to content

Commit ccb2f9c

Browse files
aledbfmboersma
authored andcommitted
ref(user-data): adjust timeouts
1 parent 6f21aec commit ccb2f9c

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

contrib/coreos/user-data.example

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,32 @@ coreos:
2424
PermissionsStartOnly=true
2525
Restart=always
2626
RestartSec=10s
27+
LimitNOFILE=40000
2728
EnvironmentFile=/etc/environment
2829
Environment="ETCD_IMAGE=quay.io/coreos/etcd:v2.0.13"
30+
Environment="ETCD_ELECTION_TIMEOUT=2000"
31+
Environment="ETCD_HEARTBEAT_INTERVAL=400"
32+
Environment="ETCD_DATA_DIR=/var/lib/etcd2"
33+
Environment="ETCD_NAME=%m"
2934
Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
30-
LimitNOFILE=40000
3135
ExecStartPre=/bin/sh -c "docker history $ETCD_IMAGE >/dev/null 2>&1 || docker pull $ETCD_IMAGE"
32-
ExecStartPre=/bin/sh -c "docker inspect etcd2 >/dev/null 2>&1 && docker rm -f etcd2 || true"
36+
ExecStartPre=/bin/sh -c "docker inspect $ETCD_NAME >/dev/null 2>&1 && docker rm -f $ETCD_NAME || true"
3337
ExecStart=/usr/bin/docker run --net=host --rm \
34-
--volume=/var/lib/etcd2:/var/lib/etcd2 \
38+
--volume=${ETCD_DATA_DIR}:/var/lib/etcd2 \
3539
--volume=/usr/share/ca-certificates:/etc/ssl/certs:ro \
3640
-p 4001:4001 -p 2380:2380 -p 2379:2379 -p 7001:7001 \
37-
--name etcd2 \
41+
--name ${ETCD_NAME} \
3842
${ETCD_IMAGE} \
39-
-name %m \
43+
-name ${ETCD_NAME} \
4044
-data-dir /var/lib/etcd2 \
4145
-advertise-client-urls http://${COREOS_PRIVATE_IPV4}:2379,http://${COREOS_PRIVATE_IPV4}:4001 \
4246
-listen-client-urls http://0.0.0.0:2379,http://0.0.0.0:4001 \
4347
-initial-advertise-peer-urls http://${COREOS_PRIVATE_IPV4}:2380,http://${COREOS_PRIVATE_IPV4}:7001 \
4448
-listen-peer-urls http://0.0.0.0:2380,http://0.0.0.0:7001 \
49+
--heartbeat-interval ${ETCD_HEARTBEAT_INTERVAL} \
50+
--election-timeout ${ETCD_ELECTION_TIMEOUT} \
4551
--discovery #DISCOVERY_URL
46-
ExecStop=-/usr/bin/docker stop etcd2
52+
ExecStop=-/usr/bin/docker stop $ETCD_NAME
4753
- name: docker-tcp.socket
4854
command: start
4955
enable: true

0 commit comments

Comments
 (0)