CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add debug line and remove exit command on retry failure

Browse Source
This commit is contained in:
William Wernert
2021-05-10 10:58:29 -04:00
parent de5552c91a
commit 8b3730748b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
salt/common/tools/sbin/soup
View File

@@ -662,6 +662,7 @@ upgrade_check() {
is_hotfix=true is_hotfix=true
fi fi
else else
echo "DEBUG: here"
is_hotfix=false is_hotfix=false
fi fi
@@ -889,7 +890,7 @@ else
systemctl start salt-master systemctl start salt-master
# Testing that that salt-master is up by checking that is it connected to itself # 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 ""
echo "Ensuring python modules for Salt are installed and patched." echo "Ensuring python modules for Salt are installed and patched."
@@ -923,7 +924,7 @@ else
systemctl start salt-master systemctl start salt-master
# Testing that that salt-master is up by checking that is it connected to itself # 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." echo "Running a highstate. This could take several minutes."
salt-call state.highstate -l info queue=True salt-call state.highstate -l info queue=True