From ea47ca7aa0ae914236192ec10a50f9f47981f842 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Tue, 5 Aug 2014 17:46:39 -0700 Subject: [PATCH] Stop passing etcd_servers to controller manager --- cluster/saltbase/salt/controller-manager/default | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/cluster/saltbase/salt/controller-manager/default b/cluster/saltbase/salt/controller-manager/default index a9e9dcd2544..8063293ac4b 100644 --- a/cluster/saltbase/salt/controller-manager/default +++ b/cluster/saltbase/salt/controller-manager/default @@ -6,10 +6,4 @@ {% if grains.master_ip is defined %} {% set master="-master=" + grains.master_ip + ":8080" %} {% 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 %} -DAEMON_ARGS="{{daemon_args}} {{master}} {{etcd_servers}}" \ No newline at end of file +DAEMON_ARGS="{{daemon_args}} {{master}}"