From 873f679bdfd29f78a89258dc557af7edc9a6c828 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 24 Jan 2024 21:18:15 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- esxi-scripts/disable-system-vms.ps1 | 5 +++-- offsite-power-check.sh | 12 ++++++------ powerwall.sh | 24 ++++++++++++------------ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/defaults.inc b/defaults.inc index 8c7afcd4..fd2187ee 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.5.154-01242024' +VERS='2.5.155-01242024' noheader=' update service dailytemp confsync -r -report ' diff --git a/esxi-scripts/disable-system-vms.ps1 b/esxi-scripts/disable-system-vms.ps1 index 18d9b817..ada67a6d 100755 --- a/esxi-scripts/disable-system-vms.ps1 +++ b/esxi-scripts/disable-system-vms.ps1 @@ -1,10 +1,11 @@ #!/usr/bin/env pwsh +### NOT WORKING ### + . /opt/idssys/powerwall/settings.ps1 Connect-VIServer -Server $VCENTERHOST -Protocol https -User $VCENTERUSER -Password $VCENTERPASS | Out-Null -$vm = Get-VM "System VMs (S)" -Set-DrsRule -Rule $affinityRule -VM $vm -Enabled $false; +Set-DrsRule -Rule 'System VMs (S)' -Enabled $false; Disconnect-VIServer -Server $VCENTERHOST -Force –Confirm:$false \ No newline at end of file diff --git a/offsite-power-check.sh b/offsite-power-check.sh index 7e049567..cbeeccfb 100755 --- a/offsite-power-check.sh +++ b/offsite-power-check.sh @@ -88,9 +88,9 @@ $(date)" for host in ${PW_OFFSITEHOSTS_IDRAC}; do if [ "${TEST}" == "" ] || [ "${TEST}" == "full" ]; then ipmitool -I lanplus -H ${host} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power on & - run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "sed -i '//{n;s/.*<\/enabled>/True<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1) - run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) - run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) + # run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "sed -i '//{n;s/.*<\/enabled>/True<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1) + # run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) + # run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) else echo "TESTMODE: Powering up '${host}'" fi @@ -118,9 +118,9 @@ $(date)" touch ${PW_TMPFOLDER}/shutdown.OFFSITE for host in ${PW_OFFSITEHOSTS}; do if [ "${TEST}" = "" ] || [ "${TEST}" = "full" ]; then - run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "sed -i '//{n;s/.*<\/enabled>/False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1) - run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) - run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) + # run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "sed -i '//{n;s/.*<\/enabled>/False<\/enabled>/}' /etc/vmware-vpx/vpxd.cfg >/dev/null 2>&1" >/dev/null 2>&1) + # run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) + # run=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "service-control --start vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${host} sh < ${PW_FOLDER}/esxi-scripts/esxi-shutdown2.sh & fi done diff --git a/powerwall.sh b/powerwall.sh index 5365a3d9..dc55a008 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -285,18 +285,18 @@ SHUTDOWN_SERVER(){ 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 -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "sed -i '//{n;s/.*<\/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}" == "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 -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_VCENTERHOST} "sed -i '//{n;s/.*<\/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