From ba749284d0a8a12cf7067b9ba3b959cf55a1c375 Mon Sep 17 00:00:00 2001
From: David Oppenheimer <davidopp@google.com>
Date: Thu, 19 Feb 2015 23:14:14 -0800
Subject: [PATCH] Have etcd listen on all interfaces so that monit probes
 succeed. Closes #3852.

---
 cluster/saltbase/salt/etcd/initd | 2 +-
 cluster/saltbase/salt/monit/etcd | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cluster/saltbase/salt/etcd/initd b/cluster/saltbase/salt/etcd/initd
index f800861c47a..8a29d5ed5f3 100755
--- a/cluster/saltbase/salt/etcd/initd
+++ b/cluster/saltbase/salt/etcd/initd
@@ -18,7 +18,7 @@ NAME=etcd
 DAEMON=/usr/local/bin/$NAME
 # 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/data -initial-advertise-peer-urls http://${HOSTNAME}:2380 -name ${HOSTNAME} -initial-cluster ${HOSTNAME}=http://${HOSTNAME}:2380"
+DAEMON_ARGS="-addr ${host_ip}:4001 -bind-addr 0.0.0.0:4001 -data-dir /var/etcd/data -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
diff --git a/cluster/saltbase/salt/monit/etcd b/cluster/saltbase/salt/monit/etcd
index 4c46863891b..981c880b886 100644
--- a/cluster/saltbase/salt/monit/etcd
+++ b/cluster/saltbase/salt/monit/etcd
@@ -3,7 +3,6 @@ group etcd
 start program = "/etc/init.d/etcd start"
 stop program = "/etc/init.d/etcd stop"
 if failed
-  host kubernetes-master
   port 4001
   protocol http
   request "/v2/keys/"