Merge pull request #2299 from riverzhang/patch-4

Fix default_resolver is undefined
This commit is contained in:
Antoine Legrand 2018-02-10 17:26:51 +01:00 committed by GitHub
commit 9916100835
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -22,7 +22,7 @@ server={{ srv }}
{% endfor %}
{% elif resolvconf_mode == 'host_resolvconf' %}
{# The default resolver is only needed when the hosts resolv.conf was modified by us. If it was not modified, we can rely on dnsmasq to reuse the systems resolv.conf #}
server={{ default_resolver }}
server={{ cloud_resolver }}
{% endif %}
{% if kube_log_level == '4' %}