[fix] Set minion id after prompting for hostname

This commit is contained in:
William Wernert
2020-04-30 10:06:53 -04:00
parent a281f59319
commit 4c6b841b16

View File

@@ -57,13 +57,6 @@ fi
whiptail_install_type
short_name=$(echo "$HOSTNAME" | awk -F. '{print $1}')
MINION_ID=$(echo "${short_name}_${install_type}" | tr '[:upper:]' '[:lower:]')
export MINION_ID
echo "MINION_ID = $MINION_ID" >> $setup_log 2>&1
whiptail_patch_schedule
if [ "$install_type" = 'EVAL' ]; then
@@ -125,6 +118,13 @@ case "$setup_type" in
;;
esac
short_name=$(echo "$HOSTNAME" | awk -F. '{print $1}')
MINION_ID=$(echo "${short_name}_${install_type}" | tr '[:upper:]' '[:lower:]')
export MINION_ID
echo "MINION_ID = $MINION_ID" >> $setup_log 2>&1
minion_type=$(get_minion_type)
# Set any constants needed