remove restarting salt in ssl generation. sperate ca and ssl generation into seperate functions

This commit is contained in:
m0duspwnens
2021-12-28 10:43:45 -05:00
parent f2adcf4ca5
commit 9e3c289562
2 changed files with 35 additions and 103 deletions

View File

@@ -761,8 +761,15 @@ echo "1" > /root/accept_changes
salt-call state.apply -l info salt.minion >> $setup_log 2>&1
fi
set_progress_str 23 'Generating CA and checking in'
salt_checkin >> $setup_log 2>&1
if [[ $is_manager || $is_helix || $is_import ]]; then
set_progress_str 23 'Generating CA'
generate_ca >> $setup_log 2>&1
fi
if [[ $is_minion ]]; then
set_progress_str 24 'Generating SSL'
generate_ssl >> $setup_log 2>&1
fi
if [[ $is_manager || $is_helix || $is_import ]]; then
set_progress_str 25 'Configuring firewall'