diff --git a/salt/common/tools/sbin/so-raid-status b/salt/common/tools/sbin/so-raid-status index 11909e012..e7da94878 100755 --- a/salt/common/tools/sbin/so-raid-status +++ b/salt/common/tools/sbin/so-raid-status @@ -17,18 +17,6 @@ . /usr/sbin/so-common -#check_boss_raid() { -# BOSSBIN=/opt/boss/mvcli -# BOSSRC=$($BOSSBIN info -o vd | grep functional) -# -# if [[ $BOSSRC ]]; then -# # Raid is good -# BOSSRAID=0 -# else -# BOSSRAID=1 -# fi -#} - check_lsi_raid() { # For use for LSI on Ubuntu #MEGA=/opt/MegaRAID/MegeCli/MegaCli64 @@ -66,13 +54,11 @@ mkdir -p /opt/so/log/raid {%- if grains['sosmodel'] in ['SOSMN', 'SOSSNNV'] %} #check_boss_raid check_software_raid -#echo "osraid=$BOSSRAID nsmraid=$SWRAID" > /opt/so/log/raid/status.log -echo "osraid=1 nsmraid=$SWRAID" > /opt/so/log/raid/status.log +echo "nsmraid=$SWRAID" > /opt/so/log/raid/status.log {%- elif grains['sosmodel'] in ['SOS1000F', 'SOS1000', 'SOSSN7200', 'SOS10K', 'SOS4000'] %} #check_boss_raid check_lsi_raid -#echo "osraid=$BOSSRAID nsmraid=$LSIRAID" > /opt/so/log/raid/status.log -echo "osraid=1 nsmraid=$LSIRAID" > /opt/so/log/raid/status.log +echo "nsmraid=$LSIRAID" > /opt/so/log/raid/status.log {%- else %} exit 0 {%- endif %}