From e9c34fe038ce7f3a8903428887edf2ce7490a288 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 28 Mar 2019 16:22:44 +0300 Subject: [PATCH] Default values for variable dns_servers and dns_domain are set in two files: (#3999) values from inventory in roles/kubespray-defaults/defaults/main.yml hardcoded values in roles/container-engine/defaults/main.yml dns_servers set empty in roles/container-engine/defaults/main.yml and skydns_server not set in docker_dns_servers variables also set default value for manual_dns_serve another variables in roles/container-engine/defaults not need to set --- roles/container-engine/defaults/main.yml | 6 ------ roles/kubespray-defaults/defaults/main.yaml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 roles/container-engine/defaults/main.yml diff --git a/roles/container-engine/defaults/main.yml b/roles/container-engine/defaults/main.yml deleted file mode 100644 index 2dbb43b14..000000000 --- a/roles/container-engine/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -## DNS -dns_domain: cluster.local -dns_servers: [] -upstream_dns_servers: [] -searchdomains: [] diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index 8eb1ee642..06d790293 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -63,7 +63,7 @@ enable_nodelocaldns: False nodelocaldns_ip: 169.254.25.10 # Should be set to a cluster IP if using a custom cluster DNS -# manual_dns_server: 10.x.x.x +manual_dns_server: "" # Can be docker_dns, host_resolvconf or none resolvconf_mode: docker_dns