orchit

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

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