C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #118 from ansibl8s/calico

Browse source 
Change calico condition --ipip
This commit is contained in:
Antoine Legrand 2016-01-29 15:51:17 +01:00
commit 6915278f65
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
roles/network_plugin/tasks/calico.yml
View file

@ -26,10 +26,15 @@
register: calico_conf register: calico_conf
run_once: true run_once: true
- name: Calico | Configure calico network pool - name: Calico | Configure calico network pool for cloud
shell: calicoctl pool add {{ kube_pods_subnet }} {%- if cloud_provider is defined and cloud_provider == True -%} --ipip{%- endif -%} command: "calicoctl pool add {{ kube_pods_subnet }} --ipip"
run_once: true run_once: true
when: calico_conf.status == 404 when: calico_conf.status == 404 and cloud_provider is defined and cloud_provider == True
- name: Calico | Configure calico network pool
command: "calicoctl pool add {{ kube_pods_subnet }}"
run_once: true
when: calico_conf.status == 404 and (cloud_provider is not defined or cloud_provider != True)
- name: Calico | Get calico configuration from etcd - name: Calico | Get calico configuration from etcd
uri: uri: