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

Fix docker dns host scenario with no search domains

Browse source 
Fixes scenario where docker-dns.conf tries to create an empty
search entry
This commit is contained in:
Matthew Mosesohn 2017-01-09 15:46:05 +03:00
parent 091b634ea1
commit 1dce56e2f8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
roles/docker/tasks/set_facts_dns.yml
View file

@ -40,13 +40,13 @@
- name: add system nameservers to docker options - name: add system nameservers to docker options
set_fact: set_fact:
docker_dns_servers: "{{ docker_dns_servers + [item] }}" docker_dns_servers: "{{ docker_dns_servers | union(system_nameservers.stdout_lines) | unique }}"
with_items: "{{ system_nameservers.stdout_lines|default([]) }}" when: system_nameservers.stdout != ""
- name: add system search domains to docker options - name: add system search domains to docker options
set_fact: set_fact:
docker_dns_search_domains: "{{ docker_dns_search_domains + [item] }}" docker_dns_search_domains: "{{ docker_dns_search_domains | union(system_search_domains.stdout.split(' ')|default([])) | unique }}"
with_items: "{{ system_search_domains.stdout.split(' ') }}" when: system_search_domains.stdout != ""
- name: check number of nameservers - name: check number of nameservers
fail: msg="Too many nameservers" fail: msg="Too many nameservers"