From fbb6066d849da2faa18e7dd8d615f828118b1035 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 10 Jun 2024 21:29:59 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- powerwall.sh | 46 +++++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/defaults.inc b/defaults.inc index 066e8757..3ce2f118 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.7.60-06052024' +VERS='2.7.61-06102024' noheader=' update service dailytemp confsync -r -report test ' diff --git a/powerwall.sh b/powerwall.sh index d40f0055..c81336f8 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -481,17 +481,17 @@ SHUTDOWN_SERVER(){ 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 + # 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 else echo -e "${idsCL[LightRed]}Host cannot be found for '${1}'${idsCL[Default]}" @@ -651,18 +651,18 @@ HOSTMGMT(){ sleep 3s done - if [ "${POWER^^}" == "ON" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ]); then - ##DECREASE CPU OVERCOMMIT - 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 - ${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 + # if [ "${POWER^^}" == "ON" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ]); then + # ##DECREASE CPU OVERCOMMIT + # 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 + # ${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 HOSTPOWER ${ESXI_HOST} ${POWER} [ -f ${PW_TMPFOLDER}/shutdown.${ESXI_HOST} ] && rm -f ${PW_TMPFOLDER}/shutdown.${ESXI_HOST}