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

Merge pull request #116 from ansibl8s/calico_on_cloud

Browse source 
Add --ipip to calico if on cloud_proivder
This commit is contained in:
Antoine Legrand 2016-01-28 20:28:15 +01:00
commit 5d24cabc83
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,3 +7,5 @@ flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address
## interface that should be used for flannel operations ## interface that should be used for flannel operations
## This is actually an inventory node-level item ## This is actually an inventory node-level item
# 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