Merge pull request #6043 from ArtfulCoder/kubelet_salt

Modified salt config to get master ip address correctly
This commit is contained in:
Piotr Szczesniak 2015-03-27 10:03:05 +01:00
commit c516aba8e8

View File

@ -5,9 +5,9 @@
{% if grains.apiservers is defined -%}
{% set apiservers = "--api_servers=https://" + grains.apiservers + ":6443" -%}
{% else -%}
{% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
{% set apiservers = "--api_servers=https://" + ips[0][0] + ":6443" -%}
{% elif grains['roles'][0] == 'kubernetes-master' -%}
{% set master_ipv4 = salt['grains.get']('fqdn_ip4')[0] -%}
{% set apiservers = "--api_servers=https://" + master_ipv4 + ":6443" -%}
{% endif -%}
{% set address = "--address=0.0.0.0" -%}