From 29378d36ee1332bf89c511773e2e821cf493a4a8 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 15 May 2023 11:03:40 -0500 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 0fb90aa0..eec7b217 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -3,10 +3,11 @@ action="${1}" -source /opt/idssys/powerwall/defaults.inc -source /opt/idssys/powerwall/powerwall.conf source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc +source /opt/idssys/powerwall/defaults.inc +source ${FOLDER}/powerwall.conf + shopt -s lastpipe @@ -364,18 +365,18 @@ SHUTDOWN_SERVERS(){ for ESXIHOST in "${ESXIHOSTS[@]}"; do echo -en "Stopping iSCSI VM's on: ${ESXIHOST} ... " - /opt/idssys/powerwall/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 + ${FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 echo "Done" echo -en "Verifying iSCSI VM's stopped on: ${ESXIHOST} ... " - /opt/idssys/powerwall/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} + ${FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} echo "Done" done # sleep 1m for ESXIHOST in "${MAINHOSTS[@]}"; do echo -en "Stopping Remaining VM's on: ${ESXIHOST} ... " ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e true -t 0' - /opt/idssys/powerwall/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 - /opt/idssys/powerwall/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 + ${FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 + ${FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 echo "Done" done sleep 1m @@ -396,8 +397,8 @@ SHUTDOWN_SERVERS(){ elif [ "${1}" = "SYS" ]; then for ESXIHOST in "${SYSHOSTS[@]}"; do echo "Shutting Down: ${ESXIHOST}" - /opt/idssys/powerwall/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 - /opt/idssys/powerwall/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 + ${FOLDER}/esxi-scripts/vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 + ${FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 ssh root@${ESXIHOST} 'esxcli system shutdown poweroff -d 10 -r "Automated ESXi host shutdown"' & ssh root@${ESXIHOST} 'esxcli system maintenanceMode set -e false -t 0' @@ -431,7 +432,7 @@ SHUTDOWN_SERVER(){ ISCSIVMSHUTDOWN(){ for ESXIHOST in "${ESXIHOSTS[@]}"; do echo -en "${idsCL[LightCyan]}Shutting down any VM's on '${ESXIHOST}, that are running on an iSCSI drive ... " - # /opt/idssys/powerwall/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 + # ${FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1 echo -e "${idsCL[Green]}DONE${idsCL[Default]}" echo done @@ -440,7 +441,7 @@ ISCSIVMSHUTDOWN(){ TEST(){ # echo "Getting info from ${1}" - # /opt/idssys/powerwall/esxi-scripts/sys-iscsi-shutdown.ps1 ${1} + # ${FOLDER}/esxi-scripts/sys-iscsi-shutdown.ps1 ${1} for ESXIHOST in "${ESXIHOSTS[@]}"; do ssh-copy-id root@${ESXIHOST}