kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2299 from riverzhang/patch-4 

Fix default_resolver is undefined
pull/2302/head
Antoine Legrand 2018-02-10 17:26:51 +01:00 committed by GitHub
parent cf183288dd bbb1da1a83
commit 9916100835
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/dnsmasq/templates/01-kube-dns.conf.j2
View File

@ -22,7 +22,7 @@ server={{ srv }}
{% endfor %} {% endfor %}
{% elif resolvconf_mode == 'host_resolvconf' %} {% 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 #} {# 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 %} {% endif %}
{% if kube_log_level == '4' %} {% if kube_log_level == '4' %}