Give more control over IPIP, but with same default behaviour

roles/network_plugin/calico/defaults/main.yml

@@ -2,8 +2,9 @@
 # Enables Internet connectivity from containers
 nat_outgoing: true
 
+# !! NOT USED in favour over calico_ipip
 # Use IP-over-IP encapsulation across hosts
-ipip: false
+# ipip: false
 
 # Set to true if you want your calico cni binaries to overwrite the
 # ones from hyperkube while leaving other cni plugins intact.

roles/network_plugin/calico/tasks/main.yml

@@ -94,7 +94,7 @@
   shell: >
     echo '{
     "kind": "ipPool",
-    "spec": {"disabled": false, "ipip": {"enabled": {{ cloud_provider is defined or ipip }}},
+    "spec": {"disabled": false, "ipip": {"enabled": {{ calico_ipip is defined | ternary(calico_ipip, cloud_provider is defined) }}},
              "nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}},
     "apiVersion": "v1",
     "metadata": {"cidr": "{{ kube_pods_subnet }}"}
@@ -111,7 +111,7 @@
   set_fact:
     ipip_arg: "--ipip"
   when: (legacy_calicoctl and
-         cloud_provider is defined or ipip)
+         calico_ipip is defined | ternary (calico_ipip, cloud_provider is defined))
   tags: facts
 
 - name: Calico (old) | Define nat-outgoing pool argument