From c8c543565623b63601f8d8c0800f3d1050979ae7 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Thu, 7 Aug 2014 14:10:33 -0400 Subject: [PATCH] Enforce --address flag is set on all Linux flavors --- cluster/saltbase/salt/kubelet/default | 4 +++- cluster/saltbase/salt/kubelet/initd | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 369ec88e5ae..c5395c42db2 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -9,9 +9,11 @@ {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %} {% endif %} +{% set address = "-address=0.0.0.0" %} +{% set config = "-config=/etc/kubernetes/manifests" %} {% set hostname_override = "" %} {% if grains.minion_ip is defined %} {% set hostname_override = " -hostname_override=" + grains.minion_ip %} {% endif %} -DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}}" +DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} {{address}} {{config}}" diff --git a/cluster/saltbase/salt/kubelet/initd b/cluster/saltbase/salt/kubelet/initd index c556b85b4e2..2d88a042b3c 100644 --- a/cluster/saltbase/salt/kubelet/initd +++ b/cluster/saltbase/salt/kubelet/initd @@ -17,7 +17,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="The Kubernetes container manager" NAME=kubelet DAEMON=/usr/local/bin/kubelet -DAEMON_ARGS="-config=/etc/kubernetes/manifests -address=0.0.0.0" +DAEMON_ARGS="" DAEMON_LOG_FILE=/var/log/$NAME.log PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME