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

Merge pull request #1959 from Security-Onion-Solutions/soup-verify-salt

Browse Source 
verify new salt version is installed during soup if not, exit before proceeding
This commit is contained in:
Josh Patterson
2020-11-17 09:53:08 -05:00
committed by GitHub
parent 12c661101a 65440f9aef
commit 86922a2388
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -458,6 +458,20 @@ if [ "$UPGRADESALT" == "1" ]; then
upgrade_salt upgrade_salt
fi fi
echo "Checking if Salt was upgraded."
echo ""
# Check that Salt was upgraded, should be 3 'salt' packages on a manager node. salt-minion, salt-master and salt or salt-common depending on Ubuntu or CentOS. we could add salt-syndic in the future so checking that there are at least 3 packages
if [[ `rpm -qa | grep salt | grep $NEWSALTVERSION | wc -l` < 3 ]]; then
echo "Salt upgrade failed. Check of indicators of failure in $SOUP_LOG."
echo "Once the issue is resolved, run soup again."
echo "Exiting."
echo ""
exit 1
else
echo "Salt upgrade success."
echo ""
fi
echo "Making pillar changes." echo "Making pillar changes."
pillar_changes pillar_changes
echo "" echo ""