set_intial_firewall policy sooner in install process so packages can be installed if masterupdates are enabled

This commit is contained in:
m0duspwnens
2020-05-29 15:34:18 -04:00
parent 42ea39ee35
commit 52954d8e5d

View File

@@ -346,22 +346,22 @@ fi
# Set initial percentage to 0 # Set initial percentage to 0
export percentage=0 export percentage=0
set_progress_str 1 'Updating packages' if [[ $is_minion ]]; then
set_progress_str 1 'Configuring firewall'
set_initial_firewall_policy >> $setup_log 2>&1
fi
set_progress_str 2 'Updating packages'
update_packages >> $setup_log 2>&1 update_packages >> $setup_log 2>&1
if [[ $is_sensor || $is_helix ]]; then if [[ $is_sensor || $is_helix ]]; then
set_progress_str 2 'Creating bond interface' set_progress_str 3 'Creating bond interface'
create_sensor_bond >> $setup_log 2>&1 create_sensor_bond >> $setup_log 2>&1
set_progress_str 3 'Generating sensor pillar' set_progress_str 4 'Generating sensor pillar'
sensor_pillar >> $setup_log 2>&1 sensor_pillar >> $setup_log 2>&1
fi fi
if [[ $is_minion ]]; then
set_progress_str 4 'Configuring firewall'
set_initial_firewall_policy >> $setup_log 2>&1
fi
set_progress_str 5 'Installing Salt and dependencies' set_progress_str 5 'Installing Salt and dependencies'
saltify 2>> $setup_log saltify 2>> $setup_log