From b0447a9af5bcfd1a50af1385b6fc0f57fc3d108e Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 5 Jan 2024 09:28:04 -0500 Subject: [PATCH] Update so-raid-status for SM based appliances --- salt/common/tools/sbin_jinja/so-raid-status | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/salt/common/tools/sbin_jinja/so-raid-status b/salt/common/tools/sbin_jinja/so-raid-status index 0249f4ccd..6cd8b84de 100755 --- a/salt/common/tools/sbin_jinja/so-raid-status +++ b/salt/common/tools/sbin_jinja/so-raid-status @@ -49,11 +49,18 @@ check_nsm_raid() { check_boss_raid() { MVCLI=$(/usr/local/bin/mvcli info -o vd |grep status |grep functional) + MVTEST=$(/usr/local/bin/mvcli info -o vd | grep "No adapter") - if [[ -n $MVCLI ]]; then - BOSSRAID=0 + # Check to see if this is a SM based system + if [[ -z $MVTEST ]]; then + if [[ -n $MVCLI ]]; then + BOSSRAID=0 + else + BOSSRAID=1 + fi else - BOSSRAID=1 + # This doesn't have boss raid so lets make it 0 + BOSSRAID=0 fi } @@ -90,4 +97,4 @@ else RAIDSTATUS=1 fi -echo "nsmraid=$RAIDSTATUS" > /opt/so/log/raid/status.log \ No newline at end of file +echo "nsmraid=$RAIDSTATUS" > /opt/so/log/raid/status.log