Merge pull request #1 from kubespray/master

...ubernetes/node/templates/manifests/kube-proxy.manifest.j2

...bernetes/node/templates/manifests/nginx-proxy.manifest.j2

roles/kubernetes/node/templates/nginx.conf.j2

roles/kubernetes/node/templates/node-kubeconfig.yaml.j2

roles/kubernetes/preinstall/defaults/main.yml

roles/kubernetes/preinstall/gen-gitinfos.sh

roles/kubernetes/preinstall/tasks/etchosts.yml

roles/kubernetes/preinstall/tasks/main.yml

roles/kubernetes/preinstall/tasks/set_facts.yml

roles/kubernetes/secrets/defaults/main.yml

roles/kubernetes/secrets/files/make-ssl.sh

roles/kubernetes/secrets/tasks/check-tokens.yml

roles/kubernetes/secrets/tasks/gen_certs.yml

roles/kubernetes/secrets/templates/openssl.conf.j2

roles/network_plugin/calico/defaults/main.yml

roles/network_plugin/calico/handlers/main.yml

roles/network_plugin/calico/meta/main.yml

roles/network_plugin/calico/tasks/main.yml

roles/network_plugin/calico/templates/calico-node.service.j2

roles/network_plugin/calico/templates/calicoctl-container.j2