diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml index c43092b45f1deba750a6cd87d8ae8d6fe2f9b366..a2b9c852f2ce45ab00acbed14c8817cf9bac800d 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 c692bc925abba5df52f6c4d3dd4ce73c9138a4bf..1cfac91abc86501efd8ba9c8fd32dd625782ae6d 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"