Merge pull request #559 from kubespray/fix_cloud_provider

fix dnsmasq template cloud_provider lookup
This commit is contained in:
Smaine Kahlouch 2016-10-21 12:25:29 +02:00 committed by GitHub
commit 8165da3f3d

View file

@ -13,7 +13,7 @@ server=/{{ dns_domain }}/{{ skydns_server }}
{% for srv in upstream_dns_servers %} {% for srv in upstream_dns_servers %}
server={{ srv }} server={{ srv }}
{% endfor %} {% endfor %}
{% elif cloud_provider == "gce" %} {% elif cloud_provider is defined and cloud_provider == "gce" %}
server=169.254.169.254 server=169.254.169.254
{% else %} {% else %}
server=8.8.8.8 server=8.8.8.8