diff --git a/powerwall.sh b/powerwall.sh index 199c108c..39fd57ba 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -1271,7 +1271,7 @@ SHUTDOWN_SERVERS(){ run=$(ssh root@${PW_VCENTERHOST} "service-control --stop vmware-vpxd >/dev/null 2>&1" >/dev/null 2>&1) run=$(ssh root@${PW_VCENTERHOST} "service-control --start vmware-vpxd >/dev/null & 2>&1" >/dev/null 2>&1) fi - echo -e "${idsCL[Green]}Done${idsCL[Default]}" + echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" for ESXIHOST in "${PW_MAINHOSTS[@]}"; do MSG="Stopping iSCSI-PRI VM's on: ${PW_ESXI_HOST_NAMES[${ESXIHOST}]}" @@ -1280,6 +1280,7 @@ SHUTDOWN_SERVERS(){ [ "${TEST}" != "true" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown.ps1 ${ESXIHOST} >/dev/null 2>&1) echo -e "${idsCL[Green]}Done${idsCL[Default]}" done + echo for ESXIHOST in "${PW_MAINHOSTS[@]}"; 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 @@ -1287,7 +1288,7 @@ SHUTDOWN_SERVERS(){ [ "${TEST}" != "true" ] && run=$(${PW_FOLDER}/esxi-scripts/host-maintenance_mode.ps1 ${ESXIHOST} & >/dev/null 2>&1) echo -e "${idsCL[Green]}Done${idsCL[Default]}" done - # sleep 1m + echo for ESXIHOST in "${PW_MAINHOSTS[@]}"; do MSG="Verifying iSCSI-PRI VM's stopped 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 @@ -1295,6 +1296,7 @@ SHUTDOWN_SERVERS(){ [ "${TEST}" != "true" ] && run=$(${PW_FOLDER}/esxi-scripts/iscsi-vm-shutdown-verify.ps1 ${ESXIHOST} >/dev/null 2>&1) echo -e "${idsCL[Green]}Done${idsCL[Default]}" done + echo for ESXIHOST in "${PW_MAINHOSTS[@]}"; do MSG="Stopping Remaining VM's 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 @@ -1305,7 +1307,7 @@ SHUTDOWN_SERVERS(){ fi echo -e "${idsCL[Green]}Done${idsCL[Default]}" done - + echo for ESXIHOST in "${PW_MAINHOSTS[@]}"; do MSG="Waiting for VM's to power off, to then shutdown '${PW_ESXI_HOST_NAMES[${ESXIHOST}]}'" c=0; MSG_SPC=''; spc1=`expr ${hc_cw} - ${#MSG}`; until [ ${c} = ${spc1} ]; do MSG_SPC="${MSG_SPC} "; ((c++)); done @@ -1313,7 +1315,7 @@ SHUTDOWN_SERVERS(){ [ "${TEST}" != "true" ] && MAINT_MODE_VERIFY_SHUTDOWN ${ESXIHOST} & echo -e "${idsCL[Green]}Continuing in background" done - + echo fi elif [ "${1^^}" == "SYS" ]; then