From b1c8927b9bbaa5e869719005ed19d75fcd69015f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 16 Nov 2024 16:42:23 -0600 Subject: [PATCH] update --- defaults.inc | 6 +++-- inc/power.inc.sh | 6 ++--- powerwall.sh | 64 ++++++++++++++---------------------------------- 3 files changed, 26 insertions(+), 50 deletions(-) diff --git a/defaults.inc b/defaults.inc index b7bc8967..0cc589ce 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.8.2-11102024' +VERS='2.8.3-11162024' noheader=' update service dailytemp confsync -r -report test ' @@ -57,11 +57,13 @@ PW_MAINHOSTS=(${PW_MAIN_HOSTS}) PW_SYSHOSTS=(${PW_SYS_HOSTS}) PW_OFFSITEHOSTS=(${PW_OFFSITE_HOSTS}) PW_ALLHOSTS=(${PW_ALL_HOSTS}) -PW_CONSERVEHOSTS=(${PW_CONSERVE_HOSTS}) PW_ESXI_FANSPEEDCONTROLHOSTS=(${PW_ESXI_FANSPEEDCONTROL_HOSTS}) [ "${PW_TEMPIND_RANGE}" != "" ] && PW_TEMPIND_RANGE=(${PW_TEMPIND_RANGE}) unset IFS +[ ! -f ${PW_ISCSI-PRI_HOST} ] && PW_ISCSI-PRI_HOST=10.10.2.10 +[ ! -f ${PW_ISCSI-SYS_HOST} ] && PW_ISCSI-PRI_HOST=10.10.2.16 + if [ -f ${PW_FOLDER}/conf/settings.local.conf ]; then declare -A PW_POWERWALL_SERVICES declare -A PW_THRESHOLDS diff --git a/inc/power.inc.sh b/inc/power.inc.sh index ac83b197..df619378 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -1241,7 +1241,7 @@ HOSTPOWER(){ if [ "${idracip}" != "" ]; then if [ "${2^^}" = "ON" ] || [ "${2^^}" = "OFF" ] || [ "${2^^}" = "STATUS" ]; then - if [ "${idracip}" = "10.10.2.20" ] && [ "${2^^}" = "ON" ]; then + if [ "${idracip}" = "${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${PW_ISCSI-PRI_HOST}]}" ] && [ "${2^^}" = "ON" ]; then MSG="Powering ON the SAS Enclosure" c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done echo -en "\n${idsCL[LightCyan]}${MSG}${MSG_SPC}: " @@ -1273,12 +1273,12 @@ HOSTPOWER(){ fi echo -e "${idsCL[Default]}" - if [ "${idracip}" = "10.10.2.20" ] && [ "${2^^}" = "OFF" ]; then + if [ "${idracip}" = "${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${PW_ISCSI-PRI_HOST}]}]}" ] && [ "${2^^}" = "OFF" ]; then MSG="Powering OFF the SAS Enclosure" c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done echo -en "${idsCL[LightCyan]}${MSG}${MSG_SPC}: " if [ "${TEST}" != "true" ]; then - if [ "$(CHECK_HOST 10.10.2.10)" = "false" ]; then + if [ "$(CHECK_HOST ${PW_ISCSI-PRI_HOST})" = "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 >/dev/null 2>&1) sleep 3s echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" diff --git a/powerwall.sh b/powerwall.sh index 97e01af4..119d8c97 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -160,30 +160,7 @@ CONSERVE_POWER(){ SHUTDOWN_SERVER ${PW_MAIN_ISCSI} -esxi off SHUTDOWN_SERVER 10.10.2.16 -esxi off } -COOLDOWN_SRVRM(){ - # ${PW_FOLDER}/esxi-scripts/cooldown.ps1 - sleep 20 - SHUTDOWN_SERVER 10.10.2.16 -esxi off - SHUTDOWN_SERVER 10.10.2.10 -esxi off - ${PW_FOLDER}/esxi-scripts/set-drs.ps1 2 -} -COOLDOWN_SRVRM_OVERNIGHT(){ - if [ "${1}" == "OFF" ]; then - echo "Cooling off server room for the night" - ${PW_FOLDER}/esxi-scripts/cooldown.overnight.ps1 - sleep 20 - SHUTDOWN_SERVER 10.10.2.16 -esxi off - sleep 60 - ${PW_FOLDER}/esxi-scripts/set-drs.ps1 2 - - elif [ "${1}" == "ON" ]; then - echo "opposite of Cooling off server room for the night" - ${PW_SCRIPT} host 6 -p on - sleep 420 - ${PW_FOLDER}/esxi-scripts/coolup.overnight.ps1 - fi - -} + MAINT_MODE_VERIFY_SHUTDOWN(){ ESXIHOST=${1} MaintMode="" @@ -282,10 +259,10 @@ SHUTDOWN_SERVER(){ fi fi - if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then - if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then + if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then + if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then MSG="Stopping all iSCSI-PRI VM's" - elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then + elif [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then MSG="Stopping all iSCSI-SYS VM's" elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then MSG="Stopping all iSCSI VM's" @@ -293,9 +270,9 @@ SHUTDOWN_SERVER(){ c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done echo -en "${idsCL[White]}${MSG}${idsCL[White]}${MSG_SPC}: " if [ "${TEST}" != "true" ]; then - if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then + if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 >/dev/null 2>&1 & - elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then + elif [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown.ps1 >/dev/null 2>&1 & elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-all-vm-shutdown.ps1 >/dev/null 2>&1 & @@ -378,15 +355,15 @@ SHUTDOWN_SERVER(){ echo fi - if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then + if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "SYS" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then MSG="Waiting for iSCSI VM's to power down" c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done echo -en "${idsCL[White]}${MSG}${idsCL[White]}${MSG_SPC}: " # for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do if [ "${TEST}" != "true" ]; then - if [ "${1}" == "10.10.2.10" ] || [ "${1}" == "MAIN" ]; then + if [ "${1}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${1}" == "MAIN" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 >/dev/null 2>&1 - elif [ "${1}" == "10.10.2.17" ] || [ "${1}" == "SYS" ]; then + elif [ "${1}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${1}" == "SYS" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 >/dev/null 2>&1 elif [ "${1}" == "MAINSITE" ] || [ "${1}" == "ALL" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 >/dev/null 2>&1 @@ -412,9 +389,9 @@ SHUTDOWN_SERVER(){ # echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}" # fi - if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then + if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then MSG="Shutting down iSCSI-PRI Server" - elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then + elif [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then MSG="Shutting down iSCSI-SYS Server" elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then MSG="Shutting down both iSCSI-PRI & iSCSI-SYS Servers" @@ -422,13 +399,13 @@ SHUTDOWN_SERVER(){ c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done echo -en "${idsCL[White]}${MSG}${MSG_SPC}: " if [ "${TEST}" != "true" ]; then - if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then - ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 10.10.2.10 >/dev/null 2>&1 & - elif [ "${ESXI_HOST}" == "10.10.2.17" ] || [ "${ESXI_HOST}" == "SYS" ]; then - ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 10.10.2.17 >/dev/null 2>&1 & + if [ "${ESXI_HOST}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${ESXI_HOST}" == "MAIN" ] || [ "${ESXI_HOST}" == "CONSERVE" ]; then + ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI-PRI_HOST} >/dev/null 2>&1 & + elif [ "${ESXI_HOST}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${ESXI_HOST}" == "SYS" ]; then + ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI-SYS_HOST} >/dev/null 2>&1 & elif [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "ALL" ]; then - ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 10.10.2.10 >/dev/null 2>&1 & - ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 10.10.2.17 >/dev/null 2>&1 & + ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI-PRI_HOST} >/dev/null 2>&1 & + ${PW_FOLDER}/esxi-scripts/iscsi-server-shutdown.ps1 ${PW_ISCSI-SYS_HOST} >/dev/null 2>&1 & fi echo -e "${idsCL[Green]}Command sent${idsCL[Default]}" else @@ -521,9 +498,9 @@ SHUTDOWN_SERVER(){ } VERIFY_ISCSI_VM_DOWN(){ - if [ "${1}" == "10.10.2.10" ] || [ "${1}" == "MAIN" ]; then + if [ "${1}" == "${PW_ISCSI-PRI_HOST}" ] || [ "${1}" == "MAIN" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 >/dev/null 2>&1 - elif [ "${1}" == "10.10.2.17" ] || [ "${1}" == "SYS" ]; then + elif [ "${1}" == "${PW_ISCSI-SYS_HOST}" ] || [ "${1}" == "SYS" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-sys-vm-shutdown-verify.ps1 >/dev/null 2>&1 elif [ "${1}" == "MAINSITE" ] || [ "${1}" == "ALL" ]; then ${PW_FOLDER}/esxi-scripts/iscsi-all-shutdown-verify.ps1 >/dev/null 2>&1 @@ -1042,9 +1019,6 @@ fi dl|downlist) DOWNLIST;; - cooldown) COOLDOWN_SRVRM;; - cooldown-overnight) COOLDOWN_SRVRM_OVERNIGHT ${2};; - oldhelp) echo -e "${idsCL[White]} Usage: ${idsCL[LightYellow]}[powerwall or pw]${idsCL[LightCyan]} {option}" echo