From 4ebcdfd05be5e458e035f524bbe5822ce6bca346 Mon Sep 17 00:00:00 2001
From: jwfang <54740235@qq.com>
Date: Thu, 22 Jun 2017 09:56:57 +0800
Subject: [PATCH] Revert "make max docker dns server configurable"

This reverts commit 6450b85b835a83e541245f7abb9c7fcc8b991632.
---
 inventory/group_vars/all.yml         | 4 ----
 roles/docker/defaults/main.yml       | 2 --
 roles/docker/tasks/set_facts_dns.yml | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml
index 999d554f2..6388ca7af 100644
--- a/inventory/group_vars/all.yml
+++ b/inventory/group_vars/all.yml
@@ -83,10 +83,6 @@ 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 ca88fa1f1..c771953ff 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -8,5 +8,3 @@ 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 1823b489b..f17c1bde2 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 > docker_max_dns_servers|int
+  when: docker_dns_servers|length > 3
 
 - name: check number of search domains
   fail: