From b39c8c1f1f19cf9a62a5a3a54438817d84b84853 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 7 May 2021 11:02:23 -0400 Subject: [PATCH] exit after 50 tries if manager cant connect to iteself via salt --- salt/common/tools/sbin/soup | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 77a2b6018..620737c16 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -802,7 +802,7 @@ else systemctl start salt-master # Testing that that salt-master is up by checking that is it connected to itself - retry 50 10 "salt-call state.show_top -l error" + retry 50 10 "salt-call state.show_top -l error" || exit 1 echo "" echo "Ensuring python modules for Salt are installed and patched." @@ -834,6 +834,10 @@ else echo "" echo "Starting Salt Master service." systemctl start salt-master + + # Testing that that salt-master is up by checking that is it connected to itself + retry 50 10 "salt-call state.show_top -l error" || exit 1 + echo "Running a highstate. This could take several minutes." salt-call state.highstate -l info queue=True postupgrade_changes