mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-02 19:11:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(dev-db/etcd): Fix command line args for >=0.1 etcd versions.

Browse Source 
-h is gone, replaced by -n, -c, and -s
This commit is contained in:
Michael Marineau 2013-08-19 19:06:27 -04:00
parent e251ff660d
commit 5793e6c7f9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap vendored
View File

@ -16,14 +16,16 @@ BOOTSTRAP="/var/run/etcd/bootstrap.config"
[ ! -e $BOOTSTRAP ] && echo bootstrap config missing && exit 1
CLUSTER_ARGS="-n $MY_IP -c $MY_IP:4001 -s $MY_IP:7001"
# strip blank lines
IPS=$(grep -v $MY_IP $BOOTSTRAP|grep -v '^\n$' |sed 's/$/:7001/'|tr '\n' ','|sed 's/^,//'|sed 's/,$//')
if [ -z "$IPS" ]; then
echo "becoming master..."
exec /usr/bin/etcd ${DEFAULT_ARGS} -h $MY_IP
exec /usr/bin/etcd ${DEFAULT_ARGS} ${CLUSTER_ARGS}
else
echo "trying $IPS"
set -x
exec /usr/bin/etcd ${DEFAULT_ARGS} -h $MY_IP -C "$IPS"
exec /usr/bin/etcd ${DEFAULT_ARGS} ${CLUSTER_ARGS} -C "$IPS"
fi