From 782cba867f12958a2bfe7f65eaa84fdbb9c0bf36 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 15 Dec 2023 08:42:42 -0600 Subject: [PATCH] update --- defaults.inc | 1 + inc/power.inc.sh | 2 +- powerwall.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index 8c27c40a..d4f04e73 100755 --- a/defaults.inc +++ b/defaults.inc @@ -33,6 +33,7 @@ source ${PW_FOLDER}/settings.conf IFS=, PW_MAINSITEHOSTS=(${PW_MAINSITE_HOSTS}) +PW_MAIN_NOISCSIHOSTS=(${PW_MAIN_NOISCSI_HOSTS}) PW_MAINHOSTS=(${PW_MAIN_HOSTS}) PW_SYSHOSTS=(${PW_SYS_HOSTS}) PW_OFFSITEHOSTS=(${PW_OFFSITE_HOSTS}) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 83ea13f4..af01d839 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -397,7 +397,7 @@ BATT VOLTAGE: ${BATTVOLT}'volts" 1 if [ ! -f ${PW_TMPFOLDER}/power.ac.conserve ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/power.ac.low)) -ge 30 ]; then echo -e "($(date +'%Y-%m-%d %H:%M:%S')) - ${INPUTACV}'volts / ${BATTVOLT}'volts - Shutting down iSCSI VM's and Host to conserve power" >> ${PW_LOGPOWER} SENDNOTICE "POWER ALERT - Conserving Power" "Shutting down iSCSI VM's and Host to conserve power" 1 - SHUTDOWN_SERVER ${PW_HOST_IDRACS['iDS-vMS-Host0']} -esxi off & + SHUTDOWN_SERVER ${PW_MAIN_ISCSI} -esxi off & touch ${PW_TMPFOLDER}/power.ac.conserve fi fi diff --git a/powerwall.sh b/powerwall.sh index b92bd41b..c0c26256 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -182,7 +182,7 @@ SHUTDOWN_SERVER(){ elif [ "${PW_HOST_ADDRESSES[${HOST}]}" != "" ]; then ESXI_HOST=${PW_HOST_ADDRESSES[${HOST}]} elif [ "${1^^}" == "ALL" ] || [ "${1^^}" == "MAINSITE" ] || [ "${1^^}" == "OFFSITE" ] || [ "${1^^}" == "MAIN" ] || [ "${1^^}" == "SYS" ]; then - ESXI_HOST=${HOST^^} + [ -f ${PW_TMPFOLDER}/power.ac.conserve ] && ESXI_HOST='MAIN_NOISCSI' || ESXI_HOST=${HOST^^} MN=1 else ESXI_HOST=''