fix for calico with kdd datastore (#4922)

* fix for calico with kdd datastore

* remove AS number from daemonset

* revert changes to canal

* additionnal fixes for kdd datastore in calico

roles/network_plugin/calico/templates/calico-node.yml.j2

@@ -145,11 +145,6 @@ spec:
             # Wait for the datastore.
             - name: WAIT_FOR_DATASTORE
               value: "true"
-            # Set based on the k8s node name.
-            - name: NODENAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
 {% endif %}
             # Choose the backend to use.
             - name: CALICO_NETWORKING_BACKEND
@@ -189,7 +184,7 @@ spec:
 # should be set in etcd before deployment
 #            # Configure the IP Pool from which Pod IPs will be chosen.
 #            - name: CALICO_IPV4POOL_CIDR
-#              value: "192.168.0.0/16"
+#              value: "{{ calico_pool_cidr | default(kube_pods_subnet) }}"
             - name: CALICO_IPV4POOL_IPIP
               value: "{{ calico_ipv4pool_ipip }}"
             # Disable IPv6 on Kubernetes.