From 442a717d75f071fff0c7e7aebc3e8bb50692209d Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 3 May 2024 12:08:57 -0400
Subject: [PATCH] orchit

---
 salt/orch/deploy_newnode.sls | 23 +++++++++++++++--------
 setup/so-setup               |  1 -
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/salt/orch/deploy_newnode.sls b/salt/orch/deploy_newnode.sls
index bf4a67574..182fff06c 100644
--- a/salt/orch/deploy_newnode.sls
+++ b/salt/orch/deploy_newnode.sls
@@ -16,11 +16,10 @@ manager_run_es_soc:
     - sls:
       - elasticsearch
       - soc
-    - kwarg:
-        queue: True
+    - queue: True
     - retry:
-        attempts: 30
-        interval: 10
+        attempts: 3
+        interval: 60
     - require:
         - salt: {{NEWNODE}}_update_mine
 {% endif %}
@@ -29,8 +28,16 @@ manager_run_es_soc:
   salt.state:
     - tgt: {{ NEWNODE }}
     - highstate: True
-    - kwarg:
-        queue: True
+    - queue: True
     - retry:
-        attempts: 30
-        interval: 10
+        attempts: 5
+        interval: 60
+
+{{NEWNODE}}_set_highstate_cron:
+  salt.state:
+    - tgt: {{ NEWNODE }}
+    - sls:
+      - setup.highstate_cron
+    - queue: True
+    - onfail:
+        - salt: {{NEWNODE}}_run_highstate
diff --git a/setup/so-setup b/setup/so-setup
index 1c3be22bf..8a1879c58 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -808,7 +808,6 @@ if ! [[ -f $install_opt_file ]]; then
 		configure_minion "$minion_type"
 		check_sos_appliance
 		drop_install_options
-		logCmd "salt-call state.apply setup.highstate_cron --local --file-root=../salt/"
 		verify_setup
 	fi