From b8dda7bf96bd62c6025fdc53d3ff3cfa4fee9f31 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 16 Jan 2024 12:54:01 -0600
Subject: [PATCH] update

---
 inc/power.inc.sh |  2 --
 powerwall.sh     | 16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 38285187..3997be4e 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -818,9 +818,7 @@ HOSTPOWER(){
 			fi
 			
 			if [ "${TEST}" != "true" ]; then
-				echo "${idracip}"
 				current_status=$(ipmitool -I lanplus -H ${idracip} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep "Power is ${2,,}")
-				echo "-"
 				if [ "${current_status}" == "" ]; then
 					echo -e "${idsCL[Green]}"
 					ipmitool -I lanplus -H ${idracip} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power ${2,,}
diff --git a/powerwall.sh b/powerwall.sh
index f036a1c5..d45b6b63 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -594,23 +594,23 @@ HOSTMGMT(){
 		
 	elif [ "${MODE}" == "power" ]; then
 		if [ ${MN} -eq 1 ]; then
-			if [ "${POWER^^}" == "ON" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "MAIN" ]) && [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${PW_MAIN_ISCSI}]}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep 'Power is on')" == "" ]; then
-				HOSTPOWER ${PW_MAIN_ISCSI} on
-				sleep 3s
-			fi
+			# if [ "${POWER^^}" == "ON" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "MAIN" ]); then
+			# 	HOSTPOWER ${PW_MAIN_ISCSI} on
+			# 	sleep 3s
+			# fi
 			
 			var=PW_${ESXI_HOST}HOSTS[@]; v=1
 			for vhost in "${!var}"; do
-				if [ "${POWER^^}" == "ON" ] && [ "${vhost}" == "${PW_MAIN_ISCSI}" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "MAIN" ]); then
-					tmp=''
-				else
+				# if [ "${POWER^^}" == "ON" ] && [ "${vhost}" == "${PW_MAIN_ISCSI}" ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || [ "${ESXI_HOST}" == "MAIN" ]); then
+				# 	tmp=''
+				# else
 					if [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${vhost}]}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep Power is ${POWER,,})" == "" ]; then
 						HOSTPOWER ${vhost} ${POWER}
 						sleep 3s
 					else
 						echo -e "\n${idsCL[LightCyan]}Host is already Powered ${POWER^^}${idsCL[Default]}"
 					fi
-				fi
+				# fi
 			done
 		else
 			if [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${PW_ESXI_HOST_NAMES[${ESXI_HOST}]}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep "Power is ${POWER,,}")" == "" ]; then