From 97c626a8e7d88aec695e9e1183309a431d7eae61 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Thu, 22 Aug 2013 08:32:59 -0700 Subject: [PATCH] fix(dev-db/etcd): listen on 0.0.0.0:4001 this fixes a regression where etcd no longer listens on 127.0.0.1 and the public ip. Fix this up because etcd needs to listen on both for user convienence and for other cluster members to talk to it. TODO: Add 127.0.0.1 test to ami test. --- .../dev-db/etcd/{etcd-0.1.1-r1.ebuild => etcd-0.1.1-r2.ebuild} | 0 .../third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.1.1-r1.ebuild => etcd-0.1.1-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap index e462e212c2..638e2c3965 100755 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap @@ -16,7 +16,7 @@ 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" +CLUSTER_ARGS="-n $MY_IP -c 0.0.0.0:4001 -s 0.0.0.0:7001" # strip blank lines IPS=$(grep -v $MY_IP $BOOTSTRAP|grep -v '^\n$' |sed 's/$/:7001/'|tr '\n' ','|sed 's/^,//'|sed 's/,$//')