update ssl state unless , check and upgrade salt minion if needed during install

This commit is contained in:
m0duspwnens
2020-07-30 11:16:37 -04:00
parent 14584b28e1
commit 3d4a96fae0
3 changed files with 7 additions and 9 deletions

View File

@@ -457,6 +457,8 @@ fi
if [[ $is_minion ]]; then
set_progress_str 20 'Accepting Salt key on manager'
accept_salt_key_remote >> $setup_log 2>&1
set_progress_str 21 'Checking if the Salt Minion needs to be updated'
salt-call state.apply salt.minion -l info >> $setup_log 2>&1
fi
if [[ $is_manager ]]; then
@@ -464,10 +466,10 @@ fi
salt-key -ya "$MINION_ID" >> $setup_log 2>&1
fi
set_progress_str 21 'Copying minion pillars to manager'
set_progress_str 22 'Copying minion pillars to manager'
copy_minion_tmp_files >> $setup_log 2>&1
set_progress_str 22 'Generating CA and checking in'
set_progress_str 23 'Generating CA and checking in'
salt_checkin >> $setup_log 2>&1
if [[ $is_manager || $is_helix ]]; then