Skip to content

K
k3s
Commit 2f93978d authored by Chao Xu's avatar Chao Xu
Browse files
Options

Merge pull request #13521 from derekwaynecarr/improve_salt_reliability

Improve reliability of salt-minion on vagrant master
parents 3a04f7ea 7afec6b2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
cluster/vagrant/util.sh
View file @ 2f93978d
...@@ -199,6 +199,9 @@ function verify-cluster { ...@@ -199,6 +199,9 @@ function verify-cluster {
local machine="master" local machine="master"
local -a required_daemon=("salt-master" "salt-minion" "kubelet") local -a required_daemon=("salt-master" "salt-minion" "kubelet")
local validated="1" local validated="1"
# This is a hack, but sometimes the salt-minion gets stuck on the master, so we just restart it
# to ensure that users never wait forever
vagrant ssh "$machine" -c "sudo systemctl restart salt-minion"
until [[ "$validated" == "0" ]]; do until [[ "$validated" == "0" ]]; do
validated="0" validated="0"
local daemon local daemon
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment