Add --ipip to calico if on cloud_proivder

2016-01-28 20:13:50 +01:00
parent faf50ea698
commit 7127e6de54
2 changed files with 3 additions and 1 deletions
--- a/roles/network_plugin/defaults/main.yml
+++ b/roles/network_plugin/defaults/main.yml
@ -4,3 +4,5 @@

 ## interface that should be used for flannel operations
 # flannel_interface:
+
+# cloud_provider: no
--- a/roles/network_plugin/tasks/calico.yml
+++ b/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