diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 37e5f891..9d35deb3 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -131,15 +131,6 @@ STATUS(){ ######################## for NTYPE in "${NODE_TYPES[@]}"; do - if [ "${ST_ACTION}" != "check" ]; then - echo -e "${idsST[Bold]}"; DIVIDER - if [ "${ST_ACTION}" = "dockers" ]; then - echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node Docker Status${idsCL[Default]}" - else - echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node Service Status${idsCL[Default]}" - fi - DIVIDER; echo -e "${idsST[Reset]}" - fi nid=1 dockers=${NTYPE}_DOCKER[@] @@ -154,6 +145,17 @@ STATUS(){ fi if [ ${GOFORCHECK} = true ]; then + + if [ "${ST_ACTION}" != "check" ]; then + echo -e "${idsST[Bold]}"; DIVIDER + if [ "${ST_ACTION}" = "dockers" ]; then + echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node Docker Status${idsCL[Default]}" + else + echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Node Service Status${idsCL[Default]}" + fi + DIVIDER; echo -e "${idsST[Reset]}" + fi + for nip in "${!var}"; do if [[ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''; LH='- localhost' else NCMD="ssh root@${nip}"; LH='' @@ -344,9 +346,7 @@ STATUS(){ if [ "${ST_ACTION}" != "check" ]; then echo; fi nid=`expr $nid + 1` done - - else #GOFORCHECK - echo -e " ${idsCL[LightCyan]}${NM_NODETYPES[$NTYPE]}-Node${nid} (${nip}) has no Dockers${idsCL[Default]}" + fi #GOFORCHECK done