From b9f91fe3281cfccc8efaf45fc677da70c86f4919 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 30 Nov 2023 09:31:06 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- powerwall.sh | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index f43e2c38..b216af53 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.3.242-11302023' +VERS='2.3.244-11302023' noheader=' update service dailytemp ' diff --git a/powerwall.sh b/powerwall.sh index b5a79aaa..0bf8b009 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -1362,7 +1362,8 @@ SHUTDOWN_SERVER(){ echo -e "${idsCL[LightYellow]}Since this is the iSCSI-PRI host server, all iSCSI-PRI VM's are being shutdown ... " for ehost in "${PW_MAINSITE_HOSTS[@]}"; do echo -en "${idsCL[LightCyan]}Stopping iSCSI-PRI VM's on: ${PW_ESXI_HOST_NAMES[${ehost}]} [${ehost}] ... " - [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ehost} #>/dev/null 2>&1 & + [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ehost} >/dev/null 2>&1 & + [ "${TEST}" != "true" ] && sleep 5s || echo "(TEST MODE)" echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" done echo -e "${idsCL[LightYellow]}All iSCSI-PRI VM's have been sent shutdown signals\n" @@ -1372,7 +1373,8 @@ SHUTDOWN_SERVER(){ echo -e "${idsCL[LightYellow]}Since this is the iSCSI-SYS host server, all iSCSI-SYS VM's are being shutdown ... " for ehost in "${PW_MAINSITE_HOSTS[@]}"; do echo -en "${idsCL[LightCyan]}Stopping iSCSI-SYS VM's on: ${PW_ESXI_HOST_NAMES[${ehost}]} [${ehost}] ... " - [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 ${ehost} #>/dev/null 2>&1 & + [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 ${ehost} >/dev/null 2>&1 & + [ "${TEST}" != "true" ] && sleep 5s || echo "(TEST MODE)" echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" done echo -e "${idsCL[LightYellow]}All iSCSI-SYS VM's have been sent shutdown signals\n" @@ -1380,8 +1382,8 @@ SHUTDOWN_SERVER(){ fi echo -en "${idsCL[LightCyan]}Enabling maintenance mode & starting iSCSI VM migrations ... " - [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} #>/dev/null 2>&1 & - [ "${TEST}" != "true" ] && sleep 25s + [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 & + [ "${TEST}" != "true" ] && sleep 25s || echo "(TEST MODE)" echo -e "${idsCL[Green]}Done\n" echo -en "${idsCL[LightCyan]}Shutting down VM's ... " @@ -1396,6 +1398,8 @@ SHUTDOWN_SERVER(){ run=$(${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1) fi run=$(${PW_FOLDER}/esxi-scripts/cls-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1) + else + echo "(TEST MODE)" fi echo -e "${idsCL[Green]}Done\n" @@ -1410,7 +1414,7 @@ SHUTDOWN_SERVER(){ echo -en "${idsCL[LightCyan]}Powering off SAS Enclosure ... " [ "${TEST}" != "true" ] && [ "$(CHECK_HOST 10.10.2.10)" == "false" ] && run=$(snmpset -v 1 -c private ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.14 i 2) - sleep 3s + [ "${TEST}" != "true" ] && sleep 3s || echo "(TEST MODE)" echo -e "${idsCL[Green]}Done\n" else