From 35e86c52cd36edd7b5b87c0f7f1da33ed90d5140 Mon Sep 17 00:00:00 2001
From: Minh Diep <minh.diep@intel.com>
Date: Mon, 11 Dec 2017 10:12:20 -0800
Subject: [PATCH] LU-9892 test: fix SuSe nfsserver setup

Checking for SuSE-release and use nfsserver
Add export info to a /etc/exports

Test-Parameters: trivial testlist=parallel-scale-nfsv4

Change-Id: Id12370ae35d878e51bdf6f71a77b1b82b5e82c33
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/30476
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---
 lustre/tests/setup-nfs.sh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lustre/tests/setup-nfs.sh b/lustre/tests/setup-nfs.sh
index 284381b..d5d54ca 100755
--- a/lustre/tests/setup-nfs.sh
+++ b/lustre/tests/setup-nfs.sh
@@ -23,18 +23,19 @@ setup_nfs() {
         mount -t rpc_pipefs sunrpc /var/lib/nfs/rpc_pipefs; }" || return 1
     sleep 5
 
-	do_nodes $LUSTRE_CLIENT "chkconfig --list nfsserver > /dev/null 2>&1 &&
-				 service nfsserver restart ||
+	do_nodes $LUSTRE_CLIENT "echo $MNTPNT *\($export_opts_v\) \
+				 >> /etc/exports" || return 1
+
+	# restart nfs server according to distro
+	do_nodes $LUSTRE_CLIENT "{ [[ -e /etc/SuSE-release ]] &&
+				 service nfsserver restart; } ||
 				 service nfs restart" || return 1
 
 	do_nodes $NFS_CLIENTS "chkconfig --list rpcidmapd 2>/dev/null |
 			       grep -q rpcidmapd && service rpcidmapd restart ||
 			       true"
 
-    do_nodes $LUSTRE_CLIENT "exportfs -o $export_opts_v *:$MNTPNT \
-        && exportfs -v" || return 1
-
-    echo -e "\nMounting NFS clients (version $NFS_VER)..."
+	echo -e "\nMounting NFS clients (version $NFS_VER)..."
 
 	do_nodes $NFS_CLIENTS "mkdir -p $nfs_climntpt" || return 1
 	if [ "$NFS_VER" = "4" ]; then
@@ -62,11 +63,11 @@ cleanup_nfs() {
 			       grep -q rpcidmapd && service rpcidmapd stop ||
 			       true"
 
-	do_nodes $LUSTRE_CLIENT "chkconfig --list nfsserver > /dev/null 2>&1 &&
-				 service nfsserver stop || service nfs stop" ||
-				return 1
+	do_nodes $LUSTRE_CLIENT "{ [[ -e /etc/SuSE-release ]] &&
+				 service nfsserver stop; } ||
+				 service nfs stop" || return 1
 
-    do_nodes $LUSTRE_CLIENT "exportfs -u *:$MNTPNT"
+	do_nodes $LUSTRE_CLIENT "sed -i '/^${MNTPNT##*/}/d' /etc/exports" || return 1
 
-    do_nodes $LUSTRE_CLIENT "exportfs -v"
+	do_nodes $LUSTRE_CLIENT "exportfs -v"
 }
-- 
1.8.3.1