b=13922

i=Nathan

32a, 32b more remote mds fixes

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 2a6a84f..3335e1f 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1095,7 +1095,8 @@ test_32a() {
         #       devices
         # or maybe this test is just totally useless on a client-only system
        [ "$mds_HOST" = "`hostname`" ] || { skip "remote MDS" && return 0; }
-       [ "$ost1_HOST" = "`hostname`" ] || { skip "remote OST" && return 0; }
+       [ "$ost_HOST" = "`hostname`" -o "$ost1_HOST" = "`hostname`" ] || \
+               { skip "remote OST" && return 0; }
 
         [ -z "$TUNEFS" ] && skip "No tunefs" && return
        local DISK1_4=$LUSTRE/tests/disk1_4.zip
@@ -1158,7 +1159,8 @@ test_32b() {
         #       devices
         # or maybe this test is just totally useless on a client-only system
         [ "$mds_HOST" = "`hostname`" ] || { skip "remote MDS" && return 0; }
-        [ "$ost1_HOST" = "`hostname`" ] || { skip "remote OST" && return 0; }
+        [ "$ost_HOST" = "`hostname`" -o "$ost1_HOST" = "`hostname`" ] || \
+               { skip "remote OST" && return 0; }
 
         [ -z "$TUNEFS" ] && skip "No tunefs" && return
        local DISK1_4=$LUSTRE/tests/disk1_4.zip