From 38c74b46b613662b03d926ece6797faaa60b6005 Mon Sep 17 00:00:00 2001
From: Josh Patterson <josh.patterson@securityonionsolutions.com>
Date: Wed, 25 Jun 2025 11:05:28 -0400
Subject: [PATCH] change salt upgrade process

---
 salt/salt/minion.sls | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index 9f2a6f3fa..57bb27694 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -39,11 +39,17 @@ unhold_salt_packages:
 
 install_salt_minion:
   cmd.run:
-    - name: |
-        exec 0>&- # close stdin
-        exec 1>&- # close stdout
-        exec 2>&- # close stderr
-        nohup /bin/sh -c '{{ UPGRADECOMMAND }}' &
+    - name: /bin/sh -c '{{ UPGRADECOMMAND }}'
+
+# minion service is in failed state after upgrade. this command will start it after the state run for the upgrade completes
+start_minion:
+  cmd.run:
+    - name: nohup /bin/sh -c 'sleep 30; systemctl start salt-minion' &
+    - require:
+      - cmd: install_salt_minion
+    - watch:
+      - cmd: install_salt_minion
+    - order: last
 
 {% endif %}