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

Revert "make max docker dns server configurable"

Browse source 
This reverts commit 6450b85b83.
This commit is contained in:
jwfang 2017-06-22 09:56:57 +08:00
parent daad366419
commit 4ebcdfd05b
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
inventory/group_vars/all.yml
View file

@ -83,10 +83,6 @@ bin_dir: /usr/local/bin
## Please note that overlay2 is only supported on newer kernels ## Please note that overlay2 is only supported on newer kernels
#docker_storage_options: -s overlay2 #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: ## Default packages to install within the cluster, f.e:
#kpm_packages: #kpm_packages:
# - name: kube-system/grafana # - name: kube-system/grafana

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

@ -8,5 +8,3 @@ docker_repo_key_info:
docker_repo_info: docker_repo_info:
repos: repos:
docker_max_dns_servers: 3

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

@ -53,7 +53,7 @@
- name: check number of nameservers - name: check number of nameservers
fail: fail:
msg: "Too many nameservers" 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 - name: check number of search domains
fail: fail: