Merge remote-tracking branch 'origin/2.4/dev' into 2.4/ubuntu

This commit is contained in:
m0duspwnens
2023-04-13 09:10:58 -04:00
10 changed files with 118 additions and 95 deletions

View File

@@ -599,6 +599,7 @@ if ! [[ -f $install_opt_file ]]; then
# Start the master service
copy_salt_master_config
configure_minion "$minion_type"
check_sos_appliance
logCmd "salt-key -yd $MINION_ID"
logCmd "salt-call state.show_top"
@@ -661,6 +662,7 @@ if ! [[ -f $install_opt_file ]]; then
update_packages
saltify
configure_minion "$minion_type"
check_sos_appliance
drop_install_options
checkin_at_boot
logCmd "salt-call state.apply setup.highstate_cron --local --file-root=../salt/"