From 353afa7cb08a494f00ba7e3040024b783c2cd9bb Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Wed, 10 Apr 2019 14:50:15 +0200
Subject: [PATCH] Fix ipip: false in calico v3 (#4473)

---
 roles/network_plugin/calico/defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index 3431bb94b..ae564b1f3 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -8,7 +8,7 @@ calico_ipv4pool_ipip: "Off"
 
 # Use IP-over-IP encapsulation across hosts
 ipip: true
-ipip_mode: Always  # change to "CrossSubnet" if you only want ipip encapsulation on traffic going across subnets
+ipip_mode: "{{ 'Always' if ipip else 'Never' }}"  # change to "CrossSubnet" if you only want ipip encapsulation on traffic going across subnets
 
 calico_cert_dir: /etc/calico/certs
 
-- 
GitLab