From 2f9c433ddb8ae838d40ed14d102d5743c2c0c91f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 4 Nov 2023 15:40:56 -0500 Subject: [PATCH] update --- esxi-scripts/iscsi-server-shutdown.ps1 | 2 +- powerwall.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/esxi-scripts/iscsi-server-shutdown.ps1 b/esxi-scripts/iscsi-server-shutdown.ps1 index d8625c83..93d748bb 100755 --- a/esxi-scripts/iscsi-server-shutdown.ps1 +++ b/esxi-scripts/iscsi-server-shutdown.ps1 @@ -4,6 +4,6 @@ Connect-VIServer -Server $args[0] -Protocol https -User $ESXiUsername -Password $ESXiPassword | Out-Null -Get-VM | Where {$_.Name -like '*iSCSI-Server*'} | Shutdown-VMGuest -Confirm:$false +Get-VM | Where {$_.Name -like '*iSCSI-*'} | Shutdown-VMGuest -Confirm:$false exit 0 diff --git a/powerwall.sh b/powerwall.sh index 22fdc7a0..72e0a186 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -1227,7 +1227,14 @@ SHUTDOWN_SERVER(){ echo -e "${idsCL[Green]}Done\n" echo -en "${idsCL[LightCyan]}Shutting down remaining VM's ... " - [ "${TEST}" != "true" ] && run=$(${PW_FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1) + 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.17" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1) + run=$(${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1) + fi + fi echo -e "${idsCL[Green]}Done\n" echo -en "${idsCL[LightCyan]}Waiting for VM's to power off to shutdown '${PW_ESXI_HOST_NAMES[${ESXIHOST}]}' ... "