Merge pull request #13171 from Security-Onion-Solutions/jertel/yaml

correct placement of error check override
Security-Onion-Solutions · Jun 8, 2024 · 7ad6baf · 7ad6baf
2 parents dea786a + f1638fa
commit 7ad6baf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
@@ -349,11 +349,11 @@ masterunlock() {
 
 phases_pillar_2_4_80() {
   echo "Checking if pillar value: elasticsearch.index_settings.global_overrides.index_template.phases exists"
+  set +e
   PHASES=$(so-yaml.py get /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.index_settings.global_overrides.index_template.phases)
   case $? in
     0)
     so-yaml.py remove /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.index_settings.global_overrides.index_template.phases
-    set +e
     read -r -d '' msg <<- EOF
 Found elasticsearch.index_settings.global_overrides.index_template.phases was set to:
 ${PHASES}
@@ -363,11 +363,11 @@ To set policies, navigate to the SOC Grid Configuration UI at elasticsearch.inde
 A backup of all pillar files was saved to /nsm/backup/
 EOF
     FINAL_MESSAGE_QUEUE+=("$msg")
-    set -e
     ;;
     2) echo "Pillar elasticsearch.index_settings.global_overrides.index_template.phases does not exist. No action taken." ;;
     *) echo "so-yaml.py returned something other than 0 or 2 exit code" ;; # we shouldn't see this
   esac
+  set -e
 }
 
 preupgrade_changes() {