Merge pull request #11929 from Security-Onion-Solutions/hf_soup

avoid exiting salt when ca state applied in post for 2.4.30
Security-Onion-Solutions · Dec 4, 2023 · 11a3e12 · 11a3e12
2 parents ace5dff + 38868af
commit 11a3e12
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
@@ -450,7 +450,10 @@ post_to_2.4.20() {
 post_to_2.4.30() {
   echo "Regenerating Elastic Agent Installers"
   /sbin/so-elastic-agent-gen-installers
+  # there is an occasional error with this state: pki_public_ca_crt: TypeError: list indices must be integers or slices, not str
+  set +e
   salt-call state.apply ca queue=True
+  set -e
   stop_salt_minion
   mv /etc/pki/managerssl.crt /etc/pki/managerssl.crt.old
   mv /etc/pki/managerssl.key /etc/pki/managerssl.key.old