From 265cde529690e960e09cc282e195b6e1d96648ce Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 1 Dec 2023 15:31:15 -0500 Subject: [PATCH] move wait_for_salt_minion for hotfix --- salt/manager/tools/sbin/soup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 5b445dae48..9d26757d89 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -768,6 +768,7 @@ apply_hotfix() { mv /etc/pki/managerssl.crt /etc/pki/managerssl.crt.old mv /etc/pki/managerssl.key /etc/pki/managerssl.key.old systemctl_func "start" "salt-minion" + (wait_for_salt_minion "$MINIONID" "5" '/dev/stdout' || fail "Salt minion was not running or ready.") 2>&1 | tee -a "$SOUP_LOG" fi else echo "No actions required. ($INSTALLEDVERSION/$HOTFIXVERSION)" @@ -875,7 +876,6 @@ main() { echo "Hotfix applied" update_version enable_highstate - (wait_for_salt_minion "$MINIONID" "5" '/dev/stdout' || fail "Salt minion was not running or ready.") 2>&1 | tee -a "$SOUP_LOG" highstate else echo ""