From 1e7aaf9ffb5a6d9ef3d34f29ac0fa273dc22de81 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Tue, 16 Mar 2021 12:32:37 -0400 Subject: [PATCH] Collect manager info before showing message about copying ssh key --- setup/files/.curlrc | 0 setup/files/.wgetrc | 0 setup/so-setup | 8 +++++--- 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 setup/files/.curlrc delete mode 100644 setup/files/.wgetrc diff --git a/setup/files/.curlrc b/setup/files/.curlrc deleted file mode 100644 index e69de29bb..000000000 diff --git a/setup/files/.wgetrc b/setup/files/.wgetrc deleted file mode 100644 index e69de29bb..000000000 diff --git a/setup/so-setup b/setup/so-setup index 62b0efb6c..c23902f8c 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -296,6 +296,10 @@ if ! [[ -f $install_opt_file ]]; then source "$net_init_file" fi + if [[ $is_minion ]]; then + collect_mngr_hostname + fi + if [[ $is_minion ]] || [[ $reinit_networking ]] || [[ $is_iso ]] && ! [[ -f $net_init_file ]]; then whiptail_management_interface_setup fi @@ -307,9 +311,7 @@ if ! [[ -f $install_opt_file ]]; then set_main_ip >> $setup_log 2>&1 compare_main_nic_ip - if [[ $is_minion ]]; then - collect_mngr_hostname - fi + reset_proxy >> $setup_log 2>&1 if [[ -z $is_airgap ]]; then