From 3ce933051adf1527861ded62964031ef08c11e3a Mon Sep 17 00:00:00 2001
From: Anupam Basak <anupambasak@users.noreply.github.com>
Date: Fri, 12 Oct 2018 12:39:36 +0530
Subject: [PATCH] calico CALICO_IPV4POOL_IPIP overriding variable (#3507)
---
roles/network_plugin/calico/defaults/main.yml | 1 +
roles/network_plugin/calico/templates/calico-node.yml.j2 | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index c43092b45..a2b9c852f 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -4,6 +4,7 @@ nat_outgoing: true
# add default ippool name
calico_pool_name: "default-pool"
+calico_ipv4pool_ipip: "Off"
# Use IP-over-IP encapsulation across hosts
ipip: true
diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2
index c692bc925..1cfac91ab 100644
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node.yml.j2
@@ -77,8 +77,8 @@ spec:
# # Configure the IP Pool from which Pod IPs will be chosen.
# - name: CALICO_IPV4POOL_CIDR
# value: "192.168.0.0/16"
-# - name: CALICO_IPV4POOL_IPIP
-# value: "always"
+ - name: CALICO_IPV4POOL_IPIP
+ value: "{{ calico_ipv4pool_ipip }}"
# Disable IPv6 on Kubernetes.
- name: FELIX_IPV6SUPPORT
value: "false"
--
GitLab