Merge pull request #1508 from tmjd/update-calico-2-4-0

Update Calico to 2.4.1 release.

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

@@ -146,6 +146,9 @@ spec:
             # Disable Calico BGP.  Calico is simply enforcing policy.
             - name: CALICO_NETWORKING
               value: "false"
+            # Cluster type to identify the deployment type
+            - name: CLUSTER_TYPE
+              value: "kubespray,canal"
             # Disable file logging so `kubectl logs` works.
             - name: CALICO_DISABLE_FILE_LOGGING
               value: "true"