make sure ssh commands get set whether automated install or not

This commit is contained in:
m0duspwnens
2021-01-05 14:12:43 -05:00
parent 0f9bf9deb6
commit 749b21e684

View File

@@ -108,9 +108,6 @@ if [[ -f automation/$automation && $(basename $automation) == $automation ]]; th
echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1 echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1
source automation/$automation source automation/$automation
automated=yes automated=yes
get_scp_cmd $automated
get_ssh_cmd $automated
get_ssh_copy_id_cmd $automated
attempt=1 attempt=1
attempts=60 attempts=60
@@ -148,6 +145,11 @@ case "$setup_type" in
;; ;;
esac esac
#set ssh command thats will be used based on if this is an automated test install or not
get_scp_cmd $automated
get_ssh_cmd $automated
get_ssh_copy_id_cmd $automated
# Allow execution of SO tools during setup # Allow execution of SO tools during setup
local_sbin="$(pwd)/../salt/common/tools/sbin" local_sbin="$(pwd)/../salt/common/tools/sbin"
export PATH=$PATH:$local_sbin export PATH=$PATH:$local_sbin