Merge pull request #559 from kubespray/fix_cloud_provider

fix dnsmasq template cloud_provider lookup
2016-10-21 12:25:29 +02:00 · 2016-10-21 12:25:29 +02:00 · 8165da3f3d
parent a423927ac9 4b7347f1cd
commit 8165da3f3d
1 changed files with 1 additions and 1 deletions
--- a/roles/dnsmasq/templates/01-kube-dns.conf.j2
+++ b/roles/dnsmasq/templates/01-kube-dns.conf.j2
@ -13,7 +13,7 @@ server=/{{ dns_domain }}/{{ skydns_server }}
 {% for srv in upstream_dns_servers %}
 server={{ srv }}
 {% endfor %}
-{% elif cloud_provider == "gce" %}
+{% elif cloud_provider is defined and cloud_provider == "gce" %}
 server=169.254.169.254
 {% else %}
 server=8.8.8.8