From be3833bce02a04a50295d0beb32292ff77f4e1d8 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 27 Jun 2021 20:40:51 -0500 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index f972fa60..c9f7792a 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -156,9 +156,11 @@ STATUS(){ fi var2=${NTYPE}_SERVICES_CHECK[@] for srvc in "${!var2}"; do - NOGOCHK=true - if [ "${nip}" = "10.5.10.122" ] && [ ${srvc} = "gitea" ] && [ ! -f ${FOLDER}/10.5.10.121.down ]; then - NOGOCHK=false + NOGOCHK=true; + if ${srvc} = "gitea" ]; then + if [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *10.5.10.120* ]]; then + NOGOCHK=false; + fi fi if [ ${NOGOCHK} = true ]; then if [ "${ST_ACTION}" != "check" ]; then @@ -1428,14 +1430,14 @@ SERVICE(){ NCMD="ssh root@${nip}" fi - GO=true; + NOGOCHK=true; if [ "${1}" == "gitea" ]; then if [[ $($NCMD /sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != *10.5.10.120* ]]; then - GO=false; + NOGOCHK=false; fi fi - if [ "${GO}" == "true" ]; then + if [ "${NOGOCHK}" == "true" ]; then if [ "${3}" != "q" ]; then echo -en "${NM_SRVCOPTS[${2}]}ing on ${NM_NODETYPES[$NTYPE]}-Node${nid} ($nip)... ${idsCL[Default]}" fi