Browse Source

Merge pull request #116 from ansibl8s/calico_on_cloud

Add --ipip to calico if on cloud_proivder
pull/117/merge
Antoine Legrand 8 years ago
parent
commit
5d24cabc83
2 changed files with 3 additions and 1 deletions
  1. 2
      roles/network_plugin/defaults/main.yml
  2. 2
      roles/network_plugin/tasks/calico.yml

2
roles/network_plugin/defaults/main.yml

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

2
roles/network_plugin/tasks/calico.yml

@ -27,7 +27,7 @@
run_once: true
- 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
when: calico_conf.status == 404

Loading…
Cancel
Save