Merge pull request #3960 from brendandburns/shell_sucks

Update etcd to version 2.0.0
This commit is contained in:
Satnam Singh
2015-01-29 18:46:18 -08:00
4 changed files with 22 additions and 6 deletions

View File

@@ -10,10 +10,10 @@
# shasum <tar>
# 6. Update this file with new tar version and new hash
{% set etcd_version="v0.4.6" %}
{% set etcd_version="v2.0.0" %}
{% set etcd_tar_url="https://storage.googleapis.com/kubernetes-release/etcd/etcd-%s-linux-amd64.tar.gz"
| format(etcd_version) %}
{% set etcd_tar_hash="sha1=5db514e30b9f340eda00671230d5136855ae14d7" %}
{% set etcd_tar_hash="sha1=b3cd41d1748bf882a58a98c9585fd5849b943811" %}
etcd-tar:
archive:

View File

@@ -16,7 +16,9 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="The etcd key-value share configuration service"
NAME=etcd
DAEMON=/usr/local/bin/$NAME
DAEMON_ARGS="-peer-addr $HOSTNAME:7001 -name $HOSTNAME"
# DAEMON_ARGS="-peer-addr $HOSTNAME:7001 -name $HOSTNAME"
host_ip=$(hostname -i)
DAEMON_ARGS="-addr ${host_ip}:4001 -bind-addr ${host_ip}:4001 -data-dir /var/etcd -initial-advertise-peer-urls http://${HOSTNAME}:2380 -name ${HOSTNAME} -initial-cluster ${HOSTNAME}=http://${HOSTNAME}:2380"
DAEMON_LOG_FILE=/var/log/$NAME.log
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME