From 8326036386198dbb6afcfbba4bcdc4d9773a72db Mon Sep 17 00:00:00 2001
From: Jian Ming Zhang <zhangjm@cn.ibm.com>
Date: Fri, 15 Apr 2016 17:27:24 +0800
Subject: [PATCH] fix ./cluster/kube-up.sh failed after vagrant halt. (issue
 #18990)

Signed-off-by: Jian Ming Zhang <zhangjm@cn.ibm.com>
---
 cluster/vagrant/provision-network-master.sh |  5 +++++
 cluster/vagrant/provision-node.sh           | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/cluster/vagrant/provision-network-master.sh b/cluster/vagrant/provision-network-master.sh
index 1f8d84a868c..2b488c55e5c 100644
--- a/cluster/vagrant/provision-network-master.sh
+++ b/cluster/vagrant/provision-network-master.sh
@@ -36,6 +36,11 @@ ETCD_INITIAL_ADVERTISE_PEER_URLS="http://${MASTER_IP}:4380"
 ETCD_INITIAL_CLUSTER="flannel=http://${MASTER_IP}:4380"
 ETCD_ADVERTISE_CLIENT_URLS="${FLANNEL_ETCD_URL}"
 EOF
+
+    # fix the etcd boot failure issue
+    sed -i '/^Restart/a RestartSec=10' /usr/lib/systemd/system/etcd.service
+    systemctl daemon-reload
+
     # Enable and start etcd
     systemctl enable etcd
     systemctl start etcd
diff --git a/cluster/vagrant/provision-node.sh b/cluster/vagrant/provision-node.sh
index c553afcc2ed..9457b5bd823 100755
--- a/cluster/vagrant/provision-node.sh
+++ b/cluster/vagrant/provision-node.sh
@@ -61,9 +61,17 @@ fi
 
 write-salt-config kubernetes-pool
 
-create-salt-kubelet-auth
-create-salt-kubeproxy-auth
+# Generate kubelet and kube-proxy auth file(kubeconfig) if there is not an existing one
+known_kubeconfig_file="/srv/salt-overlay/salt/kubelet/kubeconfig"
+if [[ ! -f "${known_kubeconfig_file}" ]]; then
+  create-salt-kubelet-auth
+  create-salt-kubeproxy-auth
+else
+  # stop kubelet, let salt start it later
+  systemctl stop kubelet
+fi
 
 install-salt
 
 run-salt
+