diff --git a/powerwall.sh b/powerwall.sh index e850fdcf..9134df92 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -215,8 +215,8 @@ SHUTDOWN_SERVER(){ ESXI_HOST=${PW_HOST_ADDRESSES[OFF-vMS-Host${HOST: -1}]} elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]} - elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAINSITE" ] || [ "${1^^}" == "OFFSITE" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ] || [ "${1^^}" == "CONSERVE" ]; then - ([ "${1^^}" == "MAIN" ] && [ -f ${PW_TMPFOLDER}/power.ac.conserve ]) && ESXI_HOST='MAIN_NOISCSI' || ESXI_HOST=${HOST^^} + elif [ "${HOST^^}" == "ALL" ] || [ "${HOST^^}" == "MAINSITE" ] || [ "${HOST^^}" == "OFFSITE" ] || [ "${HOST^^}" == "MAIN" ] || [ "${HOST^^}" == "SYS" ] || [ "${HOST^^}" == "CONSERVE" ]; then + ([ "${HOST^^}" == "MAIN" ] && [ -f ${PW_TMPFOLDER}/power.ac.conserve ]) && ESXI_HOST='MAIN_NOISCSI' || ESXI_HOST=${HOST^^} MN=1 else ESXI_HOST='' @@ -501,18 +501,18 @@ SHUTDOWN_SERVER(){ touch ${PW_TMPFOLDER}/maintmode.${ESXI_HOST} fi - ##DECREASE CPU OVERCOMMIT - # if [[ "${PW_OFFSITE_HOSTS}" != *"${ESXI_HOST}"* ]] && [ "${ESXI_HOST}" != "OFFSITE" ]; then - # MSG="Decreasing DRS CPU-Overcommit back down to 2" - # c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done - # echo -en "${idsCL[White]}${MSG}${MSG_SPC}: " - # if [ "${TEST}" != "true" ]; then - # sleep 120s && ${PW_FOLDER}/esxi-scripts/set-drs.ps1 2 >/dev/null 2>&1 & - # echo -e "${idsCL[Green]}Command Sent${idsCL[Default]}\n" - # else - # echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}\n" - # fi - # fi + ## DECREASE CPU OVERCOMMIT + if [[ "${PW_OFFSITE_HOSTS}" != *"${ESXI_HOST}"* ]] && [ "${HOST^^}" != "OFFSITE" ]; then + MSG="Decreasing DRS CPU-Overcommit back down to 2" + c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done + echo -en "${idsCL[White]}${MSG}${MSG_SPC}: " + if [ "${TEST}" != "true" ]; then + sleep 120s && ${PW_FOLDER}/esxi-scripts/set-drs.ps1 2 >/dev/null 2>&1 & + echo -e "${idsCL[Green]}Command Sent${idsCL[Default]}\n" + else + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}\n" + fi + fi else echo -e "${idsCL[LightRed]}Host cannot be found for '${1}'${idsCL[Default]}"