diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index d9b05390bf9..369ec88e5ae 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -14,4 +14,4 @@ {% set hostname_override = " -hostname_override=" + grains.minion_ip %} {% endif %} -DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} -config=/etc/kubernetes/manifests" +DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}}" diff --git a/cluster/saltbase/salt/kubelet/initd b/cluster/saltbase/salt/kubelet/initd index 1db34ed332f..c556b85b4e2 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/kubelet/data/`hostname` -address=0.0.0.0" +DAEMON_ARGS="-config=/etc/kubernetes/manifests -address=0.0.0.0" DAEMON_LOG_FILE=/var/log/$NAME.log PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME