Fixed conflicts, ipip:true as defualt and added ipip_mode

This commit is contained in:
AtzeDeVries
2017-07-08 14:36:44 +02:00
74 changed files with 466 additions and 357 deletions

View File

@@ -83,6 +83,9 @@ bin_dir: /usr/local/bin
## Please note that overlay2 is only supported on newer kernels
#docker_storage_options: -s overlay2
# Uncomment this if you have more than 3 nameservers, then we'll only use the first 3.
#docker_dns_servers_strict: false
## Default packages to install within the cluster, f.e:
#kpm_packages:
# - name: kube-system/grafana

View File

@@ -133,3 +133,8 @@ efk_enabled: false
# Helm deployment
helm_enabled: false
# dnsmasq
# dnsmasq_upstream_dns_servers:
# - /resolvethiszone.with/10.0.4.250
# - 8.8.8.8