move calico options from all.yml to k8s-cluster/k8s-net-calico.yml

This commit is contained in:
Sergey Bondarev 2018-09-18 21:30:49 +03:00
parent 93429bc661
commit e766dd5582
2 changed files with 5 additions and 5 deletions

View file

@ -38,11 +38,6 @@ bin_dir: /usr/local/bin
## modules. ## modules.
#kubelet_load_modules: false #kubelet_load_modules: false
## With calico it is possible to distributed routes with border routers of the datacenter.
## Warning : enabling router peering will disable calico's default behavior ('node mesh').
## The subnets of each nodes will be distributed by the datacenter router
#peer_with_router: false
## Upstream dns servers used by dnsmasq ## Upstream dns servers used by dnsmasq
#upstream_dns_servers: #upstream_dns_servers:
# - 8.8.8.8 # - 8.8.8.8

View file

@ -1,5 +1,10 @@
# see roles/network_plugin/calico/defaults/main.yml # see roles/network_plugin/calico/defaults/main.yml
## With calico it is possible to distributed routes with border routers of the datacenter.
## Warning : enabling router peering will disable calico's default behavior ('node mesh').
## The subnets of each nodes will be distributed by the datacenter router
#peer_with_router: false
# Enables Internet connectivity from containers # Enables Internet connectivity from containers
# nat_outgoing: true # nat_outgoing: true