From cd3e9dd50cc471346e5009c0366851d78d23ed12 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 9 Dec 2023 19:27:48 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- powerwall.sh | 69 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/defaults.inc b/defaults.inc index 83a2d2eb..9d7bc79d 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.3.403-12092023' +VERS='2.3.405-12092023' noheader=' update service dailytemp ' diff --git a/powerwall.sh b/powerwall.sh index 9bd40815..524d8fb6 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -1476,29 +1476,40 @@ 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" ] && sleep 5s || echo -en "(TEST MODE) " - echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" + if [ "${TEST}" != "true" ]; then + ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ehost} >/dev/null 2>&1 & + echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" + sleep 5s + else + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" + fi done echo -e "${idsCL[LightYellow]}All iSCSI-PRI VM's have been sent shutdown signals\n" - sleep 10s 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 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" ] && sleep 5s || echo -en "(TEST MODE) " - echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" + if [ "${TEST}" != "true" ]; then + ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 ${ehost} >/dev/null 2>&1 & + echo -e "${idsCL[Green]}Commands sent${idsCL[Default]}" + sleep 5s + else + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" + fi done echo -e "${idsCL[LightYellow]}All iSCSI-SYS VM's have been sent shutdown signals\n" - sleep 10s fi + [ "${TEST}" != "true" ] && sleep 10s echo -en "${idsCL[LightCyan]}Enabling maintenance mode & starting any iSCSI VM migrations needed ... " - [ "${TEST}" != "true" ] && ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 & - [ "${TEST}" != "true" ] && sleep 25s || echo -en "(TEST MODE) " - echo -e "${idsCL[Green]}Done\n" + if [ "${TEST}" != "true" ]; then + ${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${PW_VCENTER_HOST_NAMES[${ESXIHOST}]} >/dev/null 2>&1 & + sleep 25s + echo -e "${idsCL[Green]}Done\n" + else + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" + fi echo -en "${idsCL[LightCyan]}Shutting down VM's ... " if [ "${TEST}" != "true" ]; then @@ -1512,14 +1523,18 @@ 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) + echo -e "${idsCL[Green]}Done\n" else - echo -en "(TEST MODE) " + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" 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}]}' ... " - [ "${TEST}" != "true" ] && MAINT_MODE_VERIFY_SHUTDOWN ${ESXIHOST} & - echo -e "${idsCL[Green]}Continuing in background\n" + if [ "${TEST}" != "true" ]; then + MAINT_MODE_VERIFY_SHUTDOWN ${ESXIHOST} & + echo -e "${idsCL[Green]}Continuing in background\n" + else + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" + fi if [ "${ESXIHOST}" == "10.10.2.10" ]; then @@ -1528,9 +1543,13 @@ SHUTDOWN_SERVER(){ echo -e "${idsCL[Green]}Done\n" 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) - [ "${TEST}" != "true" ] && sleep 3s || echo -en "(TEST MODE) " - echo -e "${idsCL[Green]}Done\n" + if [ "${TEST}" != "true" ] && [ "$(CHECK_HOST 10.10.2.10)" == "false" ]; then + 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 + echo -e "${idsCL[Green]}Done\n" + else + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" + fi else echo -e "${idsCL[LightCyan]}The host ${host} (${ESXIHOST}) will be shutdown momentarily ... \n" @@ -1648,18 +1667,22 @@ HOSTPOWER(){ if [ "${2^^}" == "ON" ] || [ "${2^^}" == "OFF" ] || [ "${2^^}" == "STATUS" ]; then if [ "${idracip}" == "10.10.2.20" ] && [ "${2^^}" == "ON" ]; then - echo -en "${idsCL[LightCyan]}Powering ON the SAS Enclosure ... " + echo -en "\n${idsCL[LightCyan]}Powering ON the SAS Enclosure ... " if [ "${TEST}" != "true" ]; then 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 1 >/dev/null 2>&1) sleep 3s echo -e "${idsCL[Green]}Done\n" else - echo -e "(TEST MODE)" + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" fi fi - echo -e "${idsCL[Green]}" - [ "${TEST}" != "true" ] && ipmitool -I lanplus -H ${idracip} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power ${2,,} || echo -en "(TEST MODE) " + if [ "${TEST}" != "true" ]; then + echo -e "${idsCL[Green]}" + ipmitool -I lanplus -H ${idracip} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power ${2,,} + else + echo -e "\n${idsCL[Yellow]}(TEST MODE)" + fi echo -e "${idsCL[Default]}" if [ "${idracip}" == "10.10.2.20" ] && [ "${2^^}" == "OFF" ]; then @@ -1673,7 +1696,7 @@ HOSTPOWER(){ echo -e "${idsCL[LightRed]}'${PW_iDRACHOST_SHORTNAMES[${idracip}]}' is not offline, not powering down\n" fi else - echo -e "(TEST MODE) " + echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" fi fi else