From 7b9f38632ba6c596ff99922aad6126cc2aff39dd Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 30 Nov 2023 09:20:40 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- powerwall.sh | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/defaults.inc b/defaults.inc index b0b17a5d..f43e2c38 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.3.241-11302023' +VERS='2.3.242-11302023' noheader=' update service dailytemp ' diff --git a/powerwall.sh b/powerwall.sh index 304ac7fa..9bd6fdce 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -1360,9 +1360,9 @@ SHUTDOWN_SERVER(){ if [ "${ESXIHOST}" == "10.10.2.10" ]; then echo -e "${idsCL[LightYellow]}Since this is the iSCSI-PRI host server, all iSCSI-PRI VM's are being shutdown ... " - for host in "${PW_MAINSITE_HOSTS[@]}"; do - echo -en "${idsCL[LightCyan]}Stopping iSCSI-PRI VM's on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]} [${ESXIHOST}] ... " - [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} #>/dev/null 2>&1 & + 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 & || 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" @@ -1370,9 +1370,9 @@ SHUTDOWN_SERVER(){ elif [ "${ESXIHOST}" == "10.10.2.17" ]; then echo -e "${idsCL[LightYellow]}Since this is the iSCSI-SYS host server, all iSCSI-SYS VM's are being shutdown ... " - for host in "${PW_MAINSITE_HOSTS[@]}"; do - echo -en "${idsCL[LightCyan]}Stopping iSCSI-SYS VM's on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]} [${ESXIHOST}] ... " - [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 ${ESXIHOST} #>/dev/null 2>&1 & + 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 & || 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,7 +1380,7 @@ 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" ] && ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 & || echo "(TEST MODE)" [ "${TEST}" != "true" ] && sleep 25s echo -e "${idsCL[Green]}Done\n" @@ -1388,9 +1388,11 @@ SHUTDOWN_SERVER(){ if [ "${TEST}" != "true" ]; then run=$(${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1) if [ "${ESXIHOST}" == "10.10.2.10" ] || [ "${ESXIHOST}" == "10.10.2.17" ]; then - # [ "${ESXIHOST}" == "10.10.2.10" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1) - [ "${ESXIHOST}" == "10.10.2.10" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST}) - [ "${ESXIHOST}" == "10.10.2.17" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1) + if [ "${ESXIHOST}" == "10.10.2.10" ]; then + run=$(${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1) + elif [ "${ESXIHOST}" == "10.10.2.17" ]; then + run=$(${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1) + fi 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)