Merge pull request #1031 from mattymo/defaultcalico

Change default network plugin to Calico

README.md

@@ -76,7 +76,7 @@ in order to avoid any issue during deployment you should disable your firewall.
 
 
 ## Network plugins
-You can choose between 4 network plugins. (default: `flannel` with vxlan backend)
+You can choose between 4 network plugins. (default: `calico`)
 
 * [**flannel**](docs/flannel.md): gre/vxlan (layer 2) networking.
 

docs/vars.md

@@ -23,7 +23,7 @@ Some variables of note include:
 * *hyperkube_image_repo* - Specify the Docker repository where Hyperkube
   resides
 * *hyperkube_image_tag* - Specify the Docker tag where Hyperkube resides
-* *kube_network_plugin* - Changes k8s plugin to Calico
+* *kube_network_plugin* - Sets k8s network plugin (default Calico)
 * *kube_proxy_mode* - Changes k8s proxy mode to iptables mode
 * *kube_version* - Specify a given Kubernetes hyperkube version
 * *searchdomains* - Array of DNS domains to search when looking up hostnames

inventory/group_vars/all.yml

@@ -105,9 +105,9 @@ etcd_multiaccess: true
 # kube_apiserver_port (default 443)
 loadbalancer_apiserver_localhost: true
 
-# Choose network plugin (calico, weave or flannel)
+# Choose network plugin (calico, canal, weave or flannel)
 # Can also be set to 'cloud', which lets the cloud provider setup appropriate routing
-kube_network_plugin: flannel
+kube_network_plugin: calico
 
 # Kubernetes internal network for services, unused block of space.
 kube_service_addresses: 10.233.0.0/18