github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #804 from lavalamp/fixEtcd

Browse Source 
Stop passing etcd_servers to controller manager
This commit is contained in:
Daniel Smith 2014-08-05 17:48:50 -07:00
commit 91b31c5552
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/saltbase/salt/controller-manager/default
View File

@ -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}}"
DAEMON_ARGS="{{daemon_args}} {{master}}"