Merge pull request #1259 from bradbeam/calico214

Updating calico to v2.1.4

roles/download/defaults/main.yml

@@ -22,8 +22,8 @@ kube_version: v1.6.1
 etcd_version: v3.0.17
 #TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
 # after migration to container download
-calico_version: "v1.1.0"
-calico_cni_version: "v1.6.2"
+calico_version: "v1.1.3"
+calico_cni_version: "v1.7.0"
 calico_policy_version: "v0.5.4"
 weave_version: 1.8.2
 flannel_version: v0.6.2