Add --ipip to calico if on cloud_proivder

2016-01-28 19:42:33 +01:00 · 2016-01-28 19:42:33 +01:00 · 925f8db610
parent faf50ea698
commit 925f8db610
4 changed files with 5 additions and 3 deletions
--- a/roles/apps/k8s-memcached
+++ b/roles/apps/k8s-memcached
@ -1 +1 @@
-Subproject commit 60a66ca0ae4dc9a7e29b9b9619134adada53e1a4
+Subproject commit 5eea5899a49b25b7f7a2048940f826bcd21de894
--- a/roles/apps/k8s-postgres
+++ b/roles/apps/k8s-postgres
@ -1 +1 @@
-Subproject commit a03a14c46f19732fa7a3ee37a37d9f0375a6e2d2
+Subproject commit 0f9cda318283ba67b73ba57e794347cbffb2a169
--- 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