From 59a06b50733727e7f1e064282e4f43116f4aee95 Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Wed, 11 Feb 2015 11:49:08 -0800 Subject: [PATCH] Don't set --etcd_servers argument for kubelet. This is ignored by all recent kubelet versions when api_servers is set. And it is set in this salt file. --- cluster/saltbase/salt/kubelet/default | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 2c921b4042f..e248a7724d7 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -2,12 +2,6 @@ {% if grains['os_family'] == 'RedHat' -%} {% set daemon_args = "" -%} {% endif -%} -{% if grains.etcd_servers is defined -%} - {% set etcd_servers = "--etcd_servers=http://" + grains.etcd_servers + ":4001" -%} -{% else -%} - {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%} - {% set etcd_servers = "--etcd_servers=http://" + ips[0][0] + ":4001" -%} -{% endif -%} {% if grains.apiservers is defined -%} {% set apiservers = "--api_servers=https://" + grains.apiservers + ":6443" -%} @@ -34,4 +28,4 @@ {% set cluster_domain = "--cluster_domain=" + pillar['dns_domain'] %} {% endif %} -DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}}" +DAEMON_ARGS="{{daemon_args}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}}"