Update Calico to 2.4.1 release.

- Switched Calico images to be pulled from quay.io
- Updated Canal too

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

@@ -143,6 +143,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"