C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fallback to default resolver if no nameservers

Browse source 
Current design expects users to define at least one
nameserver in the nameservers var to backup host OS DNS config
when the K8s cluster DNS service IP is not available and hosts
still have to resolve external or intranet FQDNs.

Fix undefined nameservers to fallback to the default_resolver.

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2016-12-16 11:29:08 +01:00
parent 3bf2c0f54f
commit e7e0e82f43
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
View file

@ -70,7 +70,7 @@
{%- if skip_dnsmasq|bool and not dns_early|bool -%} {%- if skip_dnsmasq|bool and not dns_early|bool -%}
{{ [ skydns_server ] + upstream_dns_servers|default([]) }} {{ [ skydns_server ] + upstream_dns_servers|default([]) }}
{%- elif dns_early|bool -%} {%- elif dns_early|bool -%}
{{ upstream_dns_servers|default([default_resolver]) }} {{ upstream_dns_servers|default([]) }}
{%- else -%} {%- else -%}
{{ [ dns_server ] }} {{ [ dns_server ] }}
{%- endif -%} {%- endif -%}
@ -78,6 +78,6 @@
- name: generate nameservers to resolvconf - name: generate nameservers to resolvconf
set_fact: set_fact:
nameserverentries: nameserverentries:
nameserver {{( dnsmasq_server + nameservers|default([])) | join(',nameserver ')}} nameserver {{( dnsmasq_server + nameservers|default([default_resolver])) | join(',nameserver ')}}
supersede_nameserver: supersede_nameserver:
supersede domain-name-servers {{( dnsmasq_server + nameservers|default([])) | join(', ') }}; supersede domain-name-servers {{( dnsmasq_server + nameservers|default([default_resolver])) | join(', ') }};