From 7127e6de54fad76d176ac506cbf22b0f684c6517 Mon Sep 17 00:00:00 2001
From: Antoine Legrand <antoine.legrand@arkena.com>
Date: Thu, 28 Jan 2016 20:13:50 +0100
Subject: [PATCH] Add --ipip to calico if on cloud_proivder
---
roles/network_plugin/defaults/main.yml | 2 ++
roles/network_plugin/tasks/calico.yml | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/roles/network_plugin/defaults/main.yml b/roles/network_plugin/defaults/main.yml
index 04fece73f..4d64d16d3 100644
--- 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
\ No newline at end of file
diff --git a/roles/network_plugin/tasks/calico.yml b/roles/network_plugin/tasks/calico.yml
index 225c20222..ae6ac82da 100644
--- 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
--
GitLab