Merge pull request #118 from ansibl8s/calico

Change calico condition --ipip
This commit is contained in:
Antoine Legrand 2016-01-29 15:51:17 +01:00
commit 6915278f65

View file

@ -26,10 +26,15 @@
register: calico_conf
run_once: true
- name: Calico | Configure calico network pool
shell: calicoctl pool add {{ kube_pods_subnet }} {%- if cloud_provider is defined and cloud_provider == True -%} --ipip{%- endif -%}
- name: Calico | Configure calico network pool for cloud
command: "calicoctl pool add {{ kube_pods_subnet }} --ipip"
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
uri: