Merge pull request #1 from kubespray/master

roles/kubernetes/master/tasks/main.yml

roles/kubernetes/master/tasks/pre-upgrade.yml

roles/kubernetes/master/tasks/start.yml

roles/kubernetes/master/templates/kube-apiserver.j2

roles/kubernetes/master/templates/kube-apiserver.service.j2

roles/kubernetes/master/templates/kubectl-kubeconfig.yaml.j2

...tes/master/templates/manifests/kube-apiserver.manifest.j2

...r/templates/manifests/kube-controller-manager.manifest.j2

...tes/master/templates/manifests/kube-scheduler.manifest.j2

roles/kubernetes/node/defaults/main.yml

roles/kubernetes/node/handlers/main.yml

roles/kubernetes/node/meta/main.yml

roles/kubernetes/node/tasks/install.yml

roles/kubernetes/node/tasks/main.yml

roles/kubernetes/node/tasks/nginx-proxy.yml

roles/kubernetes/node/templates/cni-calico.conf.j2

roles/kubernetes/node/templates/deb-kubelet.initd.j2

roles/kubernetes/node/templates/kubelet-container.j2

roles/kubernetes/node/templates/kubelet.j2

roles/kubernetes/node/templates/kubelet.service.j2