From 161cee3bead5d60e19967d5e3be9081ecdc96c91 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 30 Oct 2023 23:42:09 -0500 Subject: [PATCH] update --- defaults.inc | 24 ++++++++++++------------ powerwall.sh | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/defaults.inc b/defaults.inc index b8dac0e1..9f596745 100755 --- a/defaults.inc +++ b/defaults.inc @@ -73,13 +73,13 @@ PW_SENSOR_ID['vMS-iDrac7']='11' # PW_SENSOR_ID['vMS-iDrac8']='12' declare -A PW_HOST_IDRACS -PW_HOST_IDRACS['vMS-iDrac0']='10.10.2.20' -PW_HOST_IDRACS['vMS-iDrac1']='10.10.2.21' +PW_HOST_IDRACS['iDS-vMS-Host0']='10.10.2.20' +PW_HOST_IDRACS['iDS-vMS-Host1']='10.10.2.21' # PW_HOST_IDRACS['vMS-iDrac2']='10.10.2.22' -PW_HOST_IDRACS['vMS-iDrac6']='10.10.2.26' -PW_HOST_IDRACS['vMS-iDrac7']='10.10.2.27' +PW_HOST_IDRACS['iDS-vMS-Host6']='10.10.2.26' +PW_HOST_IDRACS['iDS-vMS-Host7']='10.10.2.27' # PW_HOST_IDRACS['vMS-iDrac8']='10.2.1.28' -PW_HOST_IDRACS['vMS-Offsite-iDrac1']='10.2.1.21' +PW_HOST_IDRACS['OFF-vMS-Host1']='10.2.1.21' declare -A PW_HOST_ADDRESSES PW_HOST_ADDRESSES['vMS-iDrac0']='10.10.2.10' @@ -99,13 +99,13 @@ PW_ESXI_HOST_NAMES['10.10.2.17']='iDS-vMS7.scity.us' PW_ESXI_HOST_NAMES['10.2.1.18']='iDS-vMS2-Offsite.scity.us' PW_ESXI_HOST_NAMES['10.2.1.11']='iDS-vMS1.Offsite.scity.us' -declare -A PW_HOST_IDRACS -PW_HOST_IDRACS['10.10.2.20']='iDS-vMS-Host0' -PW_HOST_IDRACS['10.10.2.21']='iDS-vMS-Host1' -PW_HOST_IDRACS['10.10.2.22']='iDS-vMS-Host2' -PW_HOST_IDRACS['10.10.2.26']='iDS-vMS-Host6' -PW_HOST_IDRACS['10.10.2.27']='iDS-vMS-Host7' -PW_HOST_IDRACS['10.2.1.21']='OFF-vMS-Host1' +declare -A PW_iDRACHOST_SHORTNAMES +PW_iDRACHOST_SHORTNAMES['10.10.2.10']='iDS-vMS-Host0' +PW_iDRACHOST_SHORTNAMES['10.10.2.11']='iDS-vMS-Host1' +PW_iDRACHOST_SHORTNAMES['10.10.2.12']='iDS-vMS-Host2' +PW_iDRACHOST_SHORTNAMES['10.10.2.16']='iDS-vMS-Host6' +PW_iDRACHOST_SHORTNAMES['10.10.2.17']='iDS-vMS-Host7' +PW_iDRACHOST_SHORTNAMES['10.2.1.11']='OFF-vMS-Host1' PW_VCENTERHOST=10.10.1.30 PW_MAINHOSTS=10.10.2.10,10.10.2.11 diff --git a/powerwall.sh b/powerwall.sh index d05191ae..abd5d659 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -551,11 +551,11 @@ CHECKPOWER(){ echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}W${idsCL[Default]}" echo - for ESXIHOST in "${!PW_HOST_IDRACS[@]}"; do + for ESXIHOST in "${PW_HOST_IDRACS[@]}"; do echo "HERE: $ESXIHOST" vHOSTPOWER=$(ssh root@${PW_RACADM_ACCESS} racadm -r ${ESXIHOST} -u ${PW_ESXI_USER} -p "'${PW_ESXI_PASS}'" getsensorinfo | grep "System Board Pwr" 2>&1) watts=$(echo ${vHOSTPOWER} | awk '/ / {print $6}' | sed -e 's/Watts//g') - echo -e "${idsCL[LightCyan]}vMS-Host ${PW_HOST_IDRACS[${ESXIHOST}]} ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}vMS-Host ${PW_iDRACHOST_SHORTNAMES[${ESXIHOST}]} ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}" done [ "${action}" != "" ] && echo