From 8b3730748b7a26d58489a9b803337b54e3f5827c Mon Sep 17 00:00:00 2001 From: William Wernert Date: Mon, 10 May 2021 10:58:29 -0400 Subject: [PATCH] Add debug line and remove exit command on retry failure --- salt/common/tools/sbin/soup | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 398aed29c..fdc983d30 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -662,6 +662,7 @@ upgrade_check() { is_hotfix=true fi else + echo "DEBUG: here" is_hotfix=false fi @@ -889,7 +890,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" || exit 1 + retry 50 10 "salt-call state.show_top -l error" echo "" echo "Ensuring python modules for Salt are installed and patched." @@ -923,7 +924,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" || exit 1 + retry 50 10 "salt-call state.show_top -l error" echo "Running a highstate. This could take several minutes." salt-call state.highstate -l info queue=True