Merge pull request #3260 from riverzhang/discoverytimeout

Add discovery_timeout to join configuration

roles/kubernetes/kubeadm/defaults/main.yml

+---
+# discovery_timeout modifies the discovery timeout
+discovery_timeout: 5m0s

roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2

@@ -3,6 +3,7 @@ kind: NodeConfiguration
 clusterName: {{ cluster_name }}
 discoveryFile: ""
 caCertPath: {{ kube_config_dir }}/ssl/ca.crt
+discoveryTimeout: {{ discovery_timeout }}
 discoveryToken: {{ kubeadm_token }}
 tlsBootstrapToken: {{ kubeadm_token }}
 token: {{ kubeadm_token }}