From 3d4fd59a159901d3deb34381fbff98e88d1d953d Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 3 May 2024 13:48:51 -0400
Subject: [PATCH] orchit

---
 salt/manager/tools/sbin/so-minion | 21 +++------------------
 salt/orch/deploy_newnode.sls      |  6 +++++-
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/salt/manager/tools/sbin/so-minion b/salt/manager/tools/sbin/so-minion
index 3f8adfa31..e31ec87d3 100755
--- a/salt/manager/tools/sbin/so-minion
+++ b/salt/manager/tools/sbin/so-minion
@@ -426,10 +426,6 @@ function checkMine() {
 
 }
 
-function updateMine() {
-	retry 20 1 "salt '$MINION_ID' mine.update" True
-}
-
 function createEVAL() {
 	is_pcaplimit=true
 	pcapspace
@@ -604,23 +600,12 @@ function addMinion() {
 }
 
 function updateMineAndApplyStates() {
-	# tell the minion to populate the mine with data from mine_functions which is populated during setup
-	# this only needs to happen on non managers since they handle this during setup
-	# and they need to wait for ca creation to update the mine
-	#updateMine
+
 	#checkMine "network.ip_addrs"
-	# apply the elasticsearch state to the manager if a new searchnode was added
-	#if [[ "$NODETYPE" == "SEARCHNODE" || "$NODETYPE" == "HEAVYNODE" ]]; then
-		# calls so-common and set_minionid sets MINIONID to local minion id
+	# calls so-common and set_minionid sets MINIONID to local minion id
 	set_minionid
-		#salt $MINIONID state.apply elasticsearch queue=True --async
-	#	salt $MINIONID state.apply soc queue=True --async
-		# $MINIONID is the minion id of the manager and $MINION_ID is the target node or the node being configured
+	# $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 }}"
-	#else
-		# run this async so the cli doesn't wait for a return
-	#	salt "$MINION_ID" state.highstate --async queue=True
-	#fi
 }
 
 function setupMinionFiles() {
diff --git a/salt/orch/deploy_newnode.sls b/salt/orch/deploy_newnode.sls
index 182fff06c..a2e6b147f 100644
--- a/salt/orch/deploy_newnode.sls
+++ b/salt/orch/deploy_newnode.sls
@@ -1,14 +1,18 @@
 {% set MANAGER = salt['pillar.get']('setup:manager') %}
 {% set NEWNODE = salt['pillar.get']('setup:newnode') %}
 
+# tell the minion to populate the mine with data from mine_functions which is populated during setup
+# this only needs to happen on non managers since they handle this during setup
+# and they need to wait for ca creation to update the mine
 {{NEWNODE}}_update_mine:
   salt.function:
     - name: mine.update
     - tgt: {{ NEWNODE }}
     - retry:
-        attempts: 24
+        attempts: 36
         interval: 5
 
+# we need to prepare the manager for a new searchnode or heavynode
 {% if NEWNODE.split('_')|last in ['searchnode', 'heavynode'] %}
 manager_run_es_soc:
   salt.state: