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