[fix][wip] Only setup proxy early on configure network setup

This commit is contained in:
William Wernert
2021-03-04 11:57:16 -05:00
parent 2e56252f54
commit d19ca943cc
2 changed files with 5 additions and 8 deletions

View File

@@ -308,7 +308,6 @@ if ! [[ -f $install_opt_file ]]; then
break
fi
done
[[ -n "$proxy_addr" ]] && set_proxy >> $setup_log 2>&1
fi
if [[ -n "$TURBO" ]]; then
@@ -357,14 +356,14 @@ minion_type=$(get_minion_type)
set_default_log_size >> $setup_log 2>&1
if [[ $is_helix ]]; then
RULESETUP=${RULESETUP:-ETOPEN}
RULESETUP=${RULESETUP:-ETOPEN}
NSMSETUP=${NSMSETUP:-BASIC}
HNSENSOR=${HNSENSOR:-inherit}
MANAGERUPDATES=${MANAGERUPDATES:-0}
fi
if [[ $is_helix || ( $is_manager && $is_node ) ]]; then
RULESETUP=${RULESETUP:-ETOPEN}
RULESETUP=${RULESETUP:-ETOPEN}
NSMSETUP=${NSMSETUP:-BASIC}
fi
@@ -384,7 +383,7 @@ fi
if [[ $is_import ]]; then
PATCHSCHEDULENAME=${PATCHSCHEDULENAME:-auto}
MTU=${MTU:-1500}
RULESETUP=${RULESETUP:-ETOPEN}
RULESETUP=${RULESETUP:-ETOPEN}
NSMSETUP=${NSMSETUP:-BASIC}
HNSENSOR=${HNSENSOR:-inherit}
MANAGERUPDATES=${MANAGERUPDATES:-0}
@@ -560,6 +559,8 @@ catch() {
# Set REDIRECTIT variable, which is used by a function outside the below subshell
set_redirect >> $setup_log 2>&1
[[ -n "$proxy_addr" ]] && set_proxy >> $setup_log 2>&1
# Begin install
{