From 5db5762b293879c455c63eb29cab7143befe89ad Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 16 Dec 2023 14:46:49 -0600
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 75 ++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index c51e6452..ee8d1979 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -233,43 +233,6 @@ SHUTDOWN_SERVER(){
 			echo "($(date +'%Y-%m-%d %H:%M:%S')) - Shutting down ${hostname}" >> ${PW_LOGFILE}
 		fi
 		
-		if [ ${MM} -eq 0 ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "OFFSITE" ] || [ "${ESXI_HOST}" == "MAINSITE" ]); then
-			if [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "OFFSITE" ]; then
-				MSG="Disabling CLS for the Offsite Cluster in vCenter"
-				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
-					run=$(ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c105105>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-					touch ${PW_TMPFOLDER}/shutdown.cls.offsite
-				else
-					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
-				fi
-			fi
-			if [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ]; then
-				MSG="Disabling CLS for the Primary Cluster in vCenter"
-				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
-					run=$(ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c1001>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
-					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
-					touch ${PW_TMPFOLDER}/shutdown.cls.mainsite
-				else
-					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
-				fi
-			fi
-			MSG="Restarting vCenter CLS Services"
-			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
-				ssh root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1 && service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null & 2>&1 &
-				echo -e "${idsCL[Green]}Continuing in background${idsCL[Default]}"
-			else
-				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
-			fi
-			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" ]; then
 			for ESXIHOST in "${PW_MAINSITEHOSTS[@]}"; do
 				if [ "${ESXI_HOST}" == "10.10.2.10" ] || [ "${ESXI_HOST}" == "MAIN" ]; then
@@ -298,6 +261,44 @@ SHUTDOWN_SERVER(){
 			echo
 		fi
 		
+		if [ ${MM} -eq 0 ] && ([ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "OFFSITE" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || ([ "${ESXI_HOST}" == "SYS" ] && [ -f ${PW_TMPFOLDER}/shutdown.MAIN ])); then
+			if [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "OFFSITE" ]; then
+				MSG="Disabling CLS for the Offsite Cluster in vCenter"
+				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
+					run=$(ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c105105>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+					touch ${PW_TMPFOLDER}/shutdown.cls.offsite
+				else
+					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
+				fi
+			fi
+			if [ "${ESXI_HOST}" == "ALL" ] || [ "${ESXI_HOST}" == "MAINSITE" ] || ([ "${ESXI_HOST}" == "SYS" ] && [ -f ${PW_TMPFOLDER}/shutdown.MAIN ]); then
+				MSG="Disabling CLS for the Primary Cluster in vCenter"
+				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
+					run=$(ssh root@${PW_VCENTERHOST} "sed -i '/<domain-c1001>/{n;s/<enabled>.*<\/enabled>/<enabled>False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1)
+					echo -e "${idsCL[Green]}Done${idsCL[Default]}"
+					touch ${PW_TMPFOLDER}/shutdown.cls.mainsite
+				else
+					echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
+				fi
+			fi
+			
+			MSG="Restarting vCenter CLS Services"
+			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
+				ssh root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1 && service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null & 2>&1 &
+				echo -e "${idsCL[Green]}Continuing in background${idsCL[Default]}"
+			else
+				echo -e "${idsCL[Yellow]}(TEST MODE)${idsCL[Default]}"
+			fi
+			echo
+		fi
+		
 		for ESXIHOST in "${ESXI_HOSTS[@]}"; do
 			MSG="Enabling maintenance mode on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}"
 			c=0; MSG_SPC=''; spc1=`expr ${HC_CW} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done