From 8b44564145cc5b88ebb02f1f54ef4592e1656665 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 1 Feb 2024 16:45:34 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- powerwall.sh | 100 ++++++++++++++++++++++----------------------------- 2 files changed, 44 insertions(+), 58 deletions(-) diff --git a/defaults.inc b/defaults.inc index b09f0700..667fef59 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.5.231-02012024' +VERS='2.5.232-02012024' noheader=' update service dailytemp confsync -r -report ' diff --git a/powerwall.sh b/powerwall.sh index 0f8747d5..d314929c 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -248,42 +248,36 @@ SHUTDOWN_SERVER(){ 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 3 >/dev/null 2>&1 - echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" + ${PW_FOLDER}/esxi-scripts/set-drs.ps1 3 >/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 [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then - # for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do + if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then + MSG="Stopping all iSCSI-PRI VM's" + elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then + MSG="Stopping all iSCSI-SYS VM's" + elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then + MSG="Stopping all iSCSI VM's" + fi + c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done + echo -en "${idsCL[White]}${MSG}${idsCL[White]}${MSG_SPC}: " + if [ "${TEST}" != "true" ]; then if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then - MSG="Stopping all iSCSI-PRI VM's" + ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 >/dev/null 2>&1 & elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then - MSG="Stopping all iSCSI-SYS VM's" + ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 >/dev/null 2>&1 & elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then - MSG="Stopping all iSCSI VM's" + ${PW_FOLDER}/esxi-scripts/iscsi-all-vm-shutdown.ps1 >/dev/null 2>&1 & fi - c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done - echo -en "${idsCL[White]}${MSG}${idsCL[White]}${MSG_SPC}: " - if [ "${TEST}" != "true" ]; then - # if [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXIHOST}]}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep 'Power is on')" != "" ]; then - if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then - ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 >/dev/null 2>&1 & - elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then - ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 >/dev/null 2>&1 & - elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then - ${PW_FOLDER}/esxi-scripts/iscsi-all-vm-shutdown.ps1 >/dev/null 2>&1 & - fi - sleep 5s - echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" - # else - # echo -e "${idsCL[Yellow]}Host Offline${idsCL[Default]}" - # fi - else - echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" - fi - # done + sleep 5s + echo -e "${idsCL[Green]}Command sent${idsCL[Default]}" + else + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" + fi echo fi @@ -409,7 +403,7 @@ SHUTDOWN_SERVER(){ ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 10.10.2.10 >/dev/null 2>&1 & ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 10.10.2.17 >/dev/null 2>&1 & fi - echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" + echo -e "${idsCL[Green]}Command sent${idsCL[Default]}" else echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" fi @@ -424,7 +418,7 @@ SHUTDOWN_SERVER(){ varvms="${PW_VCENTER_HOST_NAMES[${ESXIHOST}]},${varvms}" done ${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 "${varvms::-1}" >/dev/null 2>&1 & - echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" + echo -e "${idsCL[Green]}Command sent${idsCL[Default]}" else echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" @@ -638,17 +632,15 @@ HOSTMGMT(){ if [ "${POWER^^}" == "ON" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ]); then ##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 - ${PW_FOLDER}/esxi-scripts/set-drs.ps1 2 >/dev/null 2>&1 - echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" - else - echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}\n" - fi - fi + 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} @@ -659,34 +651,28 @@ HOSTMGMT(){ } ISCSIVMSHUTDOWN(){ - for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do - echo -en "${idsCL[LightCyan]}Shutting down any VM's on '${ESXIHOST}' that are running on an iSCSI-PRI drive ... " - ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 & - echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" - echo - done + echo -en "${idsCL[LightCyan]}Shutting down any VM's that are running on an iSCSI-PRI drive ... " + ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 >/dev/null 2>&1 & + echo -e "${idsCL[Green]}Command sent${idsCL[Default]}" + echo echo -e "${idsCL[LightCyan]}Please wait a few minutes while all iSCSI guests are shutdown ..." echo } ISCSISYSSHUTDOWN(){ - for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do - echo -en "${idsCL[LightCyan]}Shutting down any VM's on '${ESXIHOST}' that are running on an iSCSI-SYS drive ... " - ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 & - echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" - echo - done + echo -en "${idsCL[LightCyan]}Shutting down any VM's that are running on an iSCSI-SYS drive ... " + ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 >/dev/null 2>&1 & + echo -e "${idsCL[Green]}Command sent${idsCL[Default]}" + echo echo -e "${idsCL[LightCyan]}Please wait a few minutes while all iSCSI guests are shutdown ..." echo } ISCSIALLSHUTDOWN(){ - for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do - echo -en "${idsCL[LightCyan]}Shutting down any VM's on '${ESXIHOST}' that are running on any iSCSI drive ... " - ${PW_FOLDER}/esxi-scripts/iscsi-all-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 & - echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" - echo - done + echo -en "${idsCL[LightCyan]}Shutting down any VM's that are running on any iSCSI drive ... " + ${PW_FOLDER}/esxi-scripts/iscsi-all-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 & + echo -e "${idsCL[Green]}Command sent${idsCL[Default]}" + echo echo -e "${idsCL[LightCyan]}Please wait a few minutes while all iSCSI guests are shutdown ..." echo