Merge pull request #2577 from woopstar/etcd-fix-4

cluster.yml

roles/etcd/defaults/main.yml

roles/etcd/handlers/main.yml

roles/etcd/tasks/configure.yml

roles/etcd/tasks/gen_certs_script.yml

roles/etcd/tasks/install_docker.yml

roles/etcd/tasks/install_host.yml

roles/etcd/tasks/install_rkt.yml

roles/etcd/tasks/join_etcd-events_member.yml

roles/etcd/tasks/join_etcd_member.yml

roles/etcd/tasks/join_member.yml

roles/etcd/tasks/main.yml

roles/etcd/tasks/refresh_config.yml

roles/etcd/tasks/set_cluster_health.yml

roles/etcd/templates/etcd-events.env.j2

roles/kubernetes/master/templates/kubeadm-config.yaml.j2