Merge fixes from b_md to HEAD so tinderbox can run.

[fs/lustre-release.git] / lustre / tests / mcr-routed-config.sh

diff --git a/lustre/tests/mcr-routed-config.sh b/lustre/tests/mcr-routed-config.sh
index eb2bec1..096520e 100755 (executable)
--- a/lustre/tests/mcr-routed-config.sh
+++ b/lustre/tests/mcr-routed-config.sh
@@ -15,17 +15,17 @@ LMC_REAL="../../lustre/utils/lmc -m $config"
 
 # TCP/IP servers
 SERVER_START=0
-SERVER_CNT=64
+SERVER_CNT=32
 GW_START=0
-GW_CNT=32
+GW_CNT=16
 MDS=${BASE}23
 UUIDLIST=${UUIDLIST:-/usr/local/admin/ba-ost/UUID.txt}
 
 echo "MDS: $MDS"
 
 # This is needed for to create route for elan network
-CLIENT_LO=36
-CLIENT_HI=155
+CLIENT_LO=38
+CLIENT_HI=191
 
 TCPBUF=1048576
  
@@ -75,11 +75,11 @@ do
       OST=${OSTBASE}$server
       echo "server: $OST"
       OBD_UUID=`awk "/$OST / { print \\$3 }" $UUIDLIST`
-      [ "$OBD_UUID" ] && OBD_UUID="--obduuid=$OBD_UUID" || echo "$OST: no UUID"
+      [ "$OBD_UUID" ] && OBD_UUID="--obduuid $OBD_UUID" || echo "$OST: no UUID"
       # server node
       ${LMC} --add net --node $OST --tcpbuf $TCPBUF --nid $OST --nettype tcp || exit 1
       # the device on the server
-      ${LMC} --add ost --lov lov1 --node $OST --obduuid $OBD_UUID --dev bluearc || exit 3
+      ${LMC} --add ost --lov lov1 --node $OST $OBD_UUID --dev bluearc || exit 3
       # route to server
       ${LMC} --add route --node $gwnode --nettype tcp --gw `h2ip $gwnode` --lo $OST || exit 2
       let server=$server+1