Merge remote-tracking branch 'origin/2.4/dev' into salt3006.5

salt/common/tools/sbin_jinja/so-raid-status

@@ -49,12 +49,19 @@ check_nsm_raid() {
 
 check_boss_raid() {
   MVCLI=$(/usr/local/bin/mvcli info -o vd |grep status |grep functional)
+  MVTEST=$(/usr/local/bin/mvcli info -o vd | grep "No adapter")
 
+  # Check to see if this is a SM based system
+  if [[ -z $MVTEST ]]; then
     if [[ -n $MVCLI ]]; then
       BOSSRAID=0
     else
       BOSSRAID=1
     fi
+  else
+    # This doesn't have boss raid so lets make it 0
+    BOSSRAID=0
+  fi
 }
 
 check_software_raid() {

salt/salt/minion.sls

@@ -71,6 +71,7 @@ enable_startup_states:
   file.uncomment:
     - name: /etc/salt/minion
     - regex: '^startup_states: highstate$'
+    - unless: pgrep so-setup
 
 # prior to 2.4.30 this managed file would restart the salt-minion service when updated
 # since this file is currently only adding a sleep timer on service start

setup/so-functions

@@ -543,6 +543,13 @@ configure_minion() {
 	} >> "$setup_log" 2>&1
 }
 
+checkin_at_boot() {
+	local minion_config=/etc/salt/minion
+
+	info "Enabling checkin at boot"
+	sed -i 's/#startup_states: highstate/startup_states: highstate/' "$minion_config"
+}
+
 check_requirements() {
 	local req_mem
 	local req_cores

setup/so-setup

@@ -781,6 +781,7 @@ if ! [[ -f $install_opt_file ]]; then
 			title "Setting up Playbook"
 			logCmd "so-playbook-reset"
 		fi
+		checkin_at_boot
 		set_initial_firewall_access
 		logCmd "salt-call schedule.enable -linfo --local"
 		verify_setup