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

updated to direct control over ipip

Browse Source
This commit is contained in:
AtzeDeVries
2017-06-23 09:16:05 +02:00
parent 7332679678
commit 61b74f9a5b
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@
shell: >
echo '{
"kind": "ipPool",
"spec": {"disabled": false, "ipip": {"enabled": {{ calico_ipip is defined | ternary(calico_ipip, cloud_provider is defined) }}},
"spec": {"disabled": false, "ipip": {"enabled": {{ ipip }}},
"nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}},
"apiVersion": "v1",
"metadata": {"cidr": "{{ kube_pods_subnet }}"}
@@ -110,8 +110,7 @@
run_once: true
set_fact:
ipip_arg: "--ipip"
when: (legacy_calicoctl and
calico_ipip is defined | ternary (calico_ipip, cloud_provider is defined))
when: (legacy_calicoctl and ipip )
tags: facts
- name: Calico (old) | Define nat-outgoing pool argument