* merged current b_devel

diff --git a/lustre/tests/lustre.cfg b/lustre/tests/lustre.cfg
deleted file mode 100644 (file)
index cc97b1b..0000000
--- a/lustre/tests/lustre.cfg
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-### REMOVE THE FOLLOWING LINES IN ORDER TO TEST LUSTRE WITH THIS CONFIG ###
-echo "lustre: edit /etc/lustre/lustre.cfg to enable, exiting" 1>&2
-exit 1
-
-# Common configuration options
-# Config file for setting up a local OST and MDS server
-NETWORK=tcp
-LOCALHOST=`hostname`
-SERVER=$LOCALHOST
-OSTNODE=$LOCALHOST
-CLIENTS=*
-PORT=988
-
-# Set up the lock manager (required)
-SETUP_LDLM=y
-
-#case `echo $LOCALHOST | sed "s/\.[^|]*//"` in
-case $LOCALHOST in
-$SERVER)
-       # Config for setting up a metadata server
-       MDSFS=extN
-       MDSDEV=/tmp/mds
-       MDSSIZE=50000
-       SETUP_MDS=y
-       ;;
-esac
-
-case $LOCALHOST in
-$OSTNODE)
-       # Config for setting up an object storage target with obdfilter
-       OSTDEV=/tmp/ost
-       OSTSIZE=200000
-       OSTFS=extN
-       OSTTYPE=obdfilter
-       SETUP_OST=y
-       ;;
-esac
-
-case $LOCALHOST in
-$CLIENTS)
-       # Config for setting up a client filesystem mount
-       SETUP_MDC=y
-       SETUP_OSC=y
-       OSCMT=/mnt/lustre
-       SETUP_MOUNT=y
-       ;;
-esac

diff --git a/lustre/tests/net-client.cfg b/lustre/tests/net-client.cfg
deleted file mode 100644 (file)
index 7cd4a8d..0000000
--- a/lustre/tests/net-client.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Config file for setting up a remote server with a real OST
-NETWORK=tcp
-LOCALHOST=dev5
-SERVER=dev4
-PORT=988