External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-12 03:47:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts, ipip:true as defualt and added ipip_mode

Browse Source
This commit is contained in:
AtzeDeVries
2017-07-08 14:36:44 +02:00
parent f5ef02d4cc 992023288f
commit e160018826
74 changed files with 466 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/network_plugin/calico/tasks/main.yml
View File

@@ -94,7 +94,7 @@
shell: >
echo '{
"kind": "ipPool",
"spec": {"disabled": false, "ipip": {"enabled": {{ ipip }}},
"spec": {"disabled": false, "ipip": {"enabled": {{ ipip }}, "mode": "{{ ipip_mode }}"},
"nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}},
"apiVersion": "v1",
"metadata": {"cidr": "{{ kube_pods_subnet }}"}