From aad14b24612e58e558f22ceb8afe6ad1db1932b5 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 13 Aug 2021 18:22:02 -0400 Subject: [PATCH 1/3] Grid Fixes --- salt/common/tools/sbin/so-raid-status | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/so-raid-status b/salt/common/tools/sbin/so-raid-status index c1b0d962b..de0e0375e 100755 --- a/salt/common/tools/sbin/so-raid-status +++ b/salt/common/tools/sbin/so-raid-status @@ -35,7 +35,7 @@ appliance_check() { } check_nsm_raid() { - PERCCLI=$(/opt/raidtools/perccli/perccli64 /c0/v0 show|grep Raid|grep Optl) + PERCCLI=$(/opt/raidtools/perccli/perccli64 /c0/v0 show|grep RAID|grep Optl) MEGACTL=$(/opt/raidtools/megasasctl |grep optimal) if [[ $APPLIANCE == '1' ]]; then @@ -52,7 +52,7 @@ check_nsm_raid() { } check_boss_raid() { - MVCLI=$(/opt/raidtools/megasasctl |grep optimal) + MVCLI=$(/usr/local/bin/mvcli info -o vd |grep status |grep functional) if [[ -n $DUDEYOUGOTADELL ]]; then if [[ -n $MVCLI ]]; then From 9beacacd4407d22e2011dcf7f7fe3f4baff90e76 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 13 Aug 2021 18:26:17 -0400 Subject: [PATCH 2/3] Grid Fixes --- salt/common/tools/sbin/so-raid-status | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/common/tools/sbin/so-raid-status b/salt/common/tools/sbin/so-raid-status index de0e0375e..f1df59ce2 100755 --- a/salt/common/tools/sbin/so-raid-status +++ b/salt/common/tools/sbin/so-raid-status @@ -83,9 +83,11 @@ check_software_raid() { appliance_check check_nsm_raid check_boss_raid +if [[ -n $APPLIANCE ]]; then {%- if grains['sosmodel'] in ['SOSMN', 'SOSSNNV'] %} check_software_raid {%- endif %} +fi if [[ -n $SWRAID ]]; then if [[ $SWRAID == '0' && BOSSRAID == '0' ]]; then From e4928334537643109543be004c38d9bfbd98b7cf Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 13 Aug 2021 18:32:55 -0400 Subject: [PATCH 3/3] Grid Fixes --- salt/common/tools/sbin/so-raid-status | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/so-raid-status b/salt/common/tools/sbin/so-raid-status index f1df59ce2..e817554d3 100755 --- a/salt/common/tools/sbin/so-raid-status +++ b/salt/common/tools/sbin/so-raid-status @@ -83,11 +83,11 @@ check_software_raid() { appliance_check check_nsm_raid check_boss_raid -if [[ -n $APPLIANCE ]]; then +{%- if salt['grains.get']('sosmodel', '') %} {%- if grains['sosmodel'] in ['SOSMN', 'SOSSNNV'] %} check_software_raid {%- endif %} -fi +{%- endif %} if [[ -n $SWRAID ]]; then if [[ $SWRAID == '0' && BOSSRAID == '0' ]]; then