From a4f84d786b596387aa0d659fb5cc8a933c95c01b Mon Sep 17 00:00:00 2001
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
Date: Tue, 15 Mar 2016 06:16:31 -0400
Subject: glusterd: default value of nfs.disable, change from false to true

Next step in eventual deprecation of glusterfs nfs server in favor
of ganesha.nfsd.

Also replace several open-coded strings with constant.

Change-Id: If52f5e880191a14fd38e69b70a32b0300dd93a50
BUG: 1092414
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/13738
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
---
 tests/bugs/snapshot/bug-1166197.t                                        | 1 +
 .../bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t | 1 +
 tests/bugs/snapshot/bug-1260848.t                                        | 1 +
 3 files changed, 3 insertions(+)

(limited to 'tests/bugs/snapshot')

diff --git a/tests/bugs/snapshot/bug-1166197.t b/tests/bugs/snapshot/bug-1166197.t
index 739839fab81..7350acfa9ed 100755
--- a/tests/bugs/snapshot/bug-1166197.t
+++ b/tests/bugs/snapshot/bug-1166197.t
@@ -15,6 +15,7 @@ TEST pidof glusterd;
 TEST setup_lvm 1
 
 TEST $CLI volume create $V0 $H0:$L1
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 TEST $CLI snapshot config activate-on-create enable
 TEST $CLI volume set $V0 features.uss enable
diff --git a/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
index 0893826b343..3776451c158 100644
--- a/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
+++ b/tests/bugs/snapshot/bug-1167580-set-proper-uid-and-gid-during-nfs-access.t
@@ -72,6 +72,7 @@ TEST setup_lvm 1
 TEST glusterd
 
 TEST $CLI volume create $V0 $H0:$L1
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume start $V0
 
 # Mount the volume as both fuse and nfs mount
diff --git a/tests/bugs/snapshot/bug-1260848.t b/tests/bugs/snapshot/bug-1260848.t
index 9963b293604..7eae3982e43 100644
--- a/tests/bugs/snapshot/bug-1260848.t
+++ b/tests/bugs/snapshot/bug-1260848.t
@@ -11,6 +11,7 @@ TEST glusterd
 TEST pidof glusterd
 
 TEST $CLI volume create $V0 disperse 6 redundancy 2 $H0:$B0/${V0}{0..5}
+TEST $CLI volume set $V0 nfs.disable false
 TEST $CLI volume set $V0 uss on
 TEST $CLI volume start $V0
 
-- 
cgit