Skip to content

Commit

Permalink
Merge pull request #11075 from Security-Onion-Solutions/2.4/soupmods
Browse files Browse the repository at this point in the history
Add soup for 2.4.20
  • Loading branch information
TOoSmOotH authored Aug 17, 2023
2 parents 45bc2ec + 4363e71 commit abad833
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions salt/manager/tools/sbin/soup
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.4.3 ]] && up_to_2.4.4
[[ "$INSTALLEDVERSION" == 2.4.4 ]] && up_to_2.4.5
[[ "$INSTALLEDVERSION" == 2.4.5 ]] && up_to_2.4.10
[[ "$INSTALLEDVERSION" == 2.4.10 ]] && up_to_2.4.20
true
}

Expand All @@ -405,6 +406,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.4.3 ]] && post_to_2.4.4
[[ "$POSTVERSION" == 2.4.4 ]] && post_to_2.4.5
[[ "$POSTVERSION" == 2.4.5 ]] && post_to_2.4.10
[[ "$POSTVERSION" == 2.4.10 ]] && post_to_2.4.20
true
}

Expand All @@ -430,6 +432,11 @@ post_to_2.4.10() {
POSTVERSION=2.4.10
}

post_to_2.4.20() {
echo "Nothing to apply"
POSTVERSION=2.4.20
}

stop_salt_master() {
# kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts
set +e
Expand Down Expand Up @@ -496,6 +503,12 @@ up_to_2.4.10() {
INSTALLEDVERSION=2.4.10
}

up_to_2.4.20() {
echo "Nothing to do for 2.4.20"

INSTALLEDVERSION=2.4.20
}

determine_elastic_agent_upgrade() {
if [[ $is_airgap -eq 0 ]]; then
update_elastic_agent_airgap
Expand Down

0 comments on commit abad833

Please sign in to comment.