External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-23 22:16:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

docker_dns_servers_strict to control docker_dns_servers rtrim

Browse Source
This commit is contained in:
jwfang
2017-06-26 17:29:12 +08:00
parent 5364a10033
commit ec2255764a
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/docker/defaults/main.yml
View File

@@ -8,3 +8,5 @@ docker_repo_key_info:
docker_repo_info:
repos:
docker_dns_servers_strict: yes

9
roles/docker/tasks/set_facts_dns.yml
View File

@@ -52,8 +52,13 @@
- name: check number of nameservers
fail:
msg: "Too many nameservers"
when: docker_dns_servers|length > 3
msg: "Too many nameservers. You can relax this check by set docker_dns_servers_strict=no and we will only use the first 3."
when: docker_dns_servers|length > 3 and docker_dns_servers_strict|bool
- name: rtrim number of nameservers to 3
set_fact:
docker_dns_servers: "{{ docker_dns_servers[0:3] }}"
when: docker_dns_servers|length > 3 and not docker_dns_servers_strict|bool
- name: check number of search domains
fail: