From bdf1b45a07252a03b31287bb2a86114ed59514df Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 3 May 2024 14:54:44 -0400
Subject: [PATCH] redirect and throw in bg

---
 salt/manager/tools/sbin/so-minion |  2 +-
 salt/orch/deploy_newnode.sls      | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/salt/manager/tools/sbin/so-minion b/salt/manager/tools/sbin/so-minion
index e31ec87d3..79eea59fe 100755
--- a/salt/manager/tools/sbin/so-minion
+++ b/salt/manager/tools/sbin/so-minion
@@ -605,7 +605,7 @@ function updateMineAndApplyStates() {
 	# calls so-common and set_minionid sets MINIONID to local minion id
 	set_minionid
 	# $MINIONID is the minion id of the manager and $MINION_ID is the target node or the node being configured
-	salt-run state.orch orch.deploy_newnode pillar="{'setup': {'manager': $MINIONID, 'newnode': $MINION_ID }}"
+	salt-run state.orch orch.deploy_newnode pillar="{'setup': {'manager': $MINIONID, 'newnode': $MINION_ID }}" > /dev/null 2>&1 &
 }
 
 function setupMinionFiles() {
diff --git a/salt/orch/deploy_newnode.sls b/salt/orch/deploy_newnode.sls
index a2e6b147f..c05a812a3 100644
--- a/salt/orch/deploy_newnode.sls
+++ b/salt/orch/deploy_newnode.sls
@@ -21,9 +21,6 @@ manager_run_es_soc:
       - elasticsearch
       - soc
     - queue: True
-    - retry:
-        attempts: 3
-        interval: 60
     - require:
         - salt: {{NEWNODE}}_update_mine
 {% endif %}
@@ -33,15 +30,3 @@ manager_run_es_soc:
     - tgt: {{ NEWNODE }}
     - highstate: True
     - queue: True
-    - retry:
-        attempts: 5
-        interval: 60
-
-{{NEWNODE}}_set_highstate_cron:
-  salt.state:
-    - tgt: {{ NEWNODE }}
-    - sls:
-      - setup.highstate_cron
-    - queue: True
-    - onfail:
-        - salt: {{NEWNODE}}_run_highstate