Skip to content

Commit

Permalink
Merge pull request kubernetes#13521 from derekwaynecarr/improve_salt_…
Browse files Browse the repository at this point in the history
…reliability

Improve reliability of salt-minion on vagrant master
  • Loading branch information
caesarxuchao committed Sep 8, 2015
2 parents 3a04f7e + 7afec6b commit 2f93978
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions cluster/vagrant/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ function verify-cluster {
local machine="master"
local -a required_daemon=("salt-master" "salt-minion" "kubelet")
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
validated="0"
local daemon
Expand Down

0 comments on commit 2f93978

Please sign in to comment.