Merge pull request #455 from polvi/c10n-ftw

fix(c10n): do not set peer if it is your own IP, will create a leader
This commit is contained in:
polvi 2014-03-18 22:12:31 -07:00
commit 1b0e4e877e

View File

@ -98,10 +98,9 @@ elif [ -n "${C10N_TOKEN}" ]; then
/usr/bin/block-until-url $C10N_ENDPOINT
ETCD_PEERS=$(curl -s $C10N_ENDPOINT -d "c10n_url=$C10N_TOKEN" -d"ip_list=$IP")
IPS=$(echo "$ETCD_PEERS" | grep -v $IP | grep -v '^$' | sed 's/$/:7001/'| tr '\n' ','| sed 's/^,//' | sed 's/,$//')
echo "[Service]" > ${ETCD_SERVICE_D}/22-c10n.conf
for peer in $ETCD_PEERS; do
echo "Environment=ETCD_PEERS=${peer}" >> ${ETCD_SERVICE_D}/22-c10n.conf
done
echo "Environment=ETCD_PEERS=${IPS}" >> ${ETCD_SERVICE_D}/22-c10n.conf
fi
if [ "$START_FLEET" = "1" ]; then