From 71f99528ae0ccf7b93dd47b3cf45c46eb6c4b0e1 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Tue, 12 May 2020 17:47:55 -0400
Subject: [PATCH] Move idstools and master earlier in the setup

---
 setup/so-setup | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index 1808a469d..6ff029f92 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -356,6 +356,13 @@ export percentage=0
 		set_progress_str 26 'Downloading containers from the internet'
 		salt-call state.apply -l info registry >> "$setup_log" 2>&1
 		docker_seed_registry 2>> "$setup_log" # ~ 60% when finished
+		
+		set_progress_str 27 "$(print_salt_state_apply 'master')"
+		salt-call state.apply -l info master >> $setup_log 2>&1
+
+		set_progress_str 28 "$(print_salt_state_apply 'idstools')"
+		salt-call state.apply -l info idstools >> $setup_log 2>&1
+
 	fi
 
 	set_progress_str 62 "$(print_salt_state_apply 'firewall')"
@@ -432,13 +439,7 @@ export percentage=0
 		salt-call state.apply -l info navigator >> $setup_log 2>&1
 	fi
 
-	if [[ $is_master || $is_helix ]]; then
-		set_progress_str 79 "$(print_salt_state_apply 'master')"
-		salt-call state.apply -l info master >> $setup_log 2>&1
-
-		set_progress_str 80 "$(print_salt_state_apply 'idstools')"
-		salt-call state.apply -l info idstools >> $setup_log 2>&1
-
+	if [[ $is_master || $is_helix ]]; then		
 		set_progress_str 81 "$(print_salt_state_apply 'utility')"
 		salt-call state.apply -l info utility >> $setup_log 2>&1
 	fi
@@ -477,4 +478,4 @@ if [[ "$success" = 0 ]]; then
 else
 	whiptail_setup_failed
 	shutdown -r now
-fi
\ No newline at end of file
+fi