kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add --ipip to calico if on cloud_proivder

pull/117/head
Antoine Legrand 2016-01-28 19:42:33 +01:00
parent faf50ea698
commit 925f8db610
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/apps/k8s-memcached

@ -1 +1 @@
Subproject commit 60a66ca0ae4dc9a7e29b9b9619134adada53e1a4 Subproject commit 5eea5899a49b25b7f7a2048940f826bcd21de894

2
roles/apps/k8s-postgres

@ -1 +1 @@
Subproject commit a03a14c46f19732fa7a3ee37a37d9f0375a6e2d2 Subproject commit 0f9cda318283ba67b73ba57e794347cbffb2a169

2
roles/network_plugin/defaults/main.yml
View File

@ -4,3 +4,5 @@
## interface that should be used for flannel operations ## interface that should be used for flannel operations
# flannel_interface: # flannel_interface:
# cloud_provider: no

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

@ -27,7 +27,7 @@
run_once: true run_once: true
- name: Calico | Configure calico network pool - name: Calico | Configure calico network pool
shell: calicoctl pool add {{ kube_pods_subnet }} command: calicoctl pool add {{ kube_pods_subnet }} {%- if cloud_provider is defined and cloud_provider == True -%} --ipip{%- endif -%}
run_once: true run_once: true
when: calico_conf.status == 404 when: calico_conf.status == 404