From 6450b85b835a83e541245f7abb9c7fcc8b991632 Mon Sep 17 00:00:00 2001 From: jwfang <54740235@qq.com> Date: Tue, 20 Jun 2017 20:06:54 +0800 Subject: [PATCH] make max docker dns server configurable --- inventory/group_vars/all.yml | 4 ++++ roles/docker/defaults/main.yml | 2 ++ roles/docker/tasks/set_facts_dns.yml | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 6388ca7af..999d554f2 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -83,6 +83,10 @@ bin_dir: /usr/local/bin ## Please note that overlay2 is only supported on newer kernels #docker_storage_options: -s overlay2 +# Maximum name servers for docker. If your host /etc/resolv.conf contains serval +# nameservers, you may need to increase this. +#docker_max_dns_servers: 3 + ## Default packages to install within the cluster, f.e: #kpm_packages: # - name: kube-system/grafana diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index c771953ff..ca88fa1f1 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -8,3 +8,5 @@ docker_repo_key_info: docker_repo_info: repos: + +docker_max_dns_servers: 3 diff --git a/roles/docker/tasks/set_facts_dns.yml b/roles/docker/tasks/set_facts_dns.yml index f17c1bde2..1823b489b 100644 --- a/roles/docker/tasks/set_facts_dns.yml +++ b/roles/docker/tasks/set_facts_dns.yml @@ -53,7 +53,7 @@ - name: check number of nameservers fail: msg: "Too many nameservers" - when: docker_dns_servers|length > 3 + when: docker_dns_servers|length > docker_max_dns_servers|int - name: check number of search domains fail: