diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 23da8b87b..bc7ac559c 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -507,6 +507,7 @@ preupgrade_changes() { [[ "$INSTALLEDVERSION" =~ ^2\.4\.21[0-9]+$ ]] && up_to_3.0.0 [[ "$INSTALLEDVERSION" == "3.0.0" ]] && up_to_3.1.0 [[ "$INSTALLEDVERSION" == "3.1.0" ]] && up_to_3.2.0 + [[ "$INSTALLEDVERSION" == "3.2.0" ]] && up_to_3.3.0 true } @@ -524,6 +525,7 @@ postupgrade_changes() { [[ "$POSTVERSION" =~ ^2\.4\.21[0-9]+$ ]] && post_to_3.0.0 [[ "$POSTVERSION" == "3.0.0" ]] && post_to_3.1.0 [[ "$POSTVERSION" == "3.1.0" ]] && post_to_3.2.0 + [[ "$POSTVERSION" == "3.2.0" ]] && post_to_3.3.0 # All applicable post-upgrade steps completed; clear the resume marker. rm -f "$POSTVERSION_FILE" true @@ -906,7 +908,7 @@ post_to_3.1.0() { recollate_postgres() { echo "" echo "Recollating PostgreSQL databases. The following output may contain warnings about a version mismatch, followed by a note indicating that the collation version has been changed." - for db in postgres securityonion so_telegraf; do + for db in template1 postgres securityonion so_telegraf; do docker exec so-postgres psql -U postgres $db -c "reindex database $db" docker exec so-postgres psql -U postgres $db -c "alter database $db refresh collation version" done @@ -1032,9 +1034,19 @@ post_to_3.2.0() { set_postversion 3.2.0 } - ### 3.2.0 End ### +### 3.2.0 Scripts ### +up_to_3.3.0() { + INSTALLEDVERSION=3.3.0 +} + +post_to_3.3.0() { + # Recollate again since some internal DBs were excluded during 3.2.0 soup + recollate_postgres +} +### 3.3.0 End ### + repo_sync() { echo "Sync the local repo."