From e89cf6f58df138d5c8e2fdc06a26634fa6e6f65d Mon Sep 17 00:00:00 2001
From: Varsha Rao <varao@redhat.com>
Date: Wed, 12 Feb 2020 13:28:23 +0530
Subject: [PATCH] vstart: Update vstart according to cluster create command

Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
---
 src/vstart.sh | 55 ++++++++-------------------------------------------
 1 file changed, 8 insertions(+), 47 deletions(-)

diff --git a/src/vstart.sh b/src/vstart.sh
index 017b7f3e5a8..cced6fbc951 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1089,45 +1089,10 @@ start_ganesha() {
 
         prun rm -rf $ganesha_dir
         prun mkdir -p $ganesha_dir
+        prun ceph_adm fs nfs cluster create tester
+	prun ceph_adm osd pool application enable nfs-ganesha nfs
 
-        echo "NFS_CORE_PARAM {
-        Enable_NLM = false;
-        Enable_RQUOTA = false;
-        Protocols = 4;
-        NFS_Port = $port;
-}
-
-CACHEINODE {
-        Dir_Chunk = 0;
-        NParts = 1;
-        Cache_Size = 1;
-}
-
-NFSv4 {
-        RecoveryBackend = 'rados_cluster';
-        Minor_Versions = 1, 2;
-}
-
-CEPH {
-       Ceph_Conf = $conf_fn;
-}
-
-RADOS_URLS {
-	   ceph_conf = $conf_fn;
-	   userid = "admin";
-}
-
-%url rados://nfs-ganesha/ganesha/export-1
-
-RADOS_KV {
-	Ceph_Conf = $conf_fn;
-	pool = 'nfs-ganesha';
-	namespace = 'ganesha';
-	UserId = 'admin';
-	nodeid = $name;
-}" > "$ganesha_dir/ganesha.conf"
-
-
+        echo "%url rados://nfs-ganesha/tester/$name" > "$ganesha_dir/ganesha.conf"
 	wconf <<EOF
 [ganesha.$name]
         host = $HOSTNAME
@@ -1137,20 +1102,16 @@ RADOS_KV {
         pid file = $ganesha_dir/ganesha.pid
 EOF
 
-        if !($CEPH_BIN/rados lspools | grep "nfs-ganesha"); then
-            prun ceph_adm osd pool create nfs-ganesha
-            prun ceph_adm osd pool application enable nfs-ganesha nfs
-        fi
-
-        prun ceph_adm fs nfs create
-        prun ganesha-rados-grace -p nfs-ganesha -n ganesha add $name
-        prun ganesha-rados-grace -p nfs-ganesha -n ganesha
+        #prun ceph_adm fs nfs create
+        prun ganesha-rados-grace -p nfs-ganesha -n tester add $name
+        prun ganesha-rados-grace -p nfs-ganesha -n tester
 
         prun /usr/bin/ganesha.nfsd -L "$ganesha_dir/ganesha.log" -f "$ganesha_dir/ganesha.conf" -p "$ganesha_dir/ganesha.pid" -N NIV_DEBUG
 
         # Wait few seconds for grace period to be removed
         sleep 2
-        prun ganesha-rados-grace -p nfs-ganesha -n ganesha
+
+        prun ganesha-rados-grace -p nfs-ganesha -n tester
 
         if $with_mgr_dashboard; then
             $CEPH_BIN/rados -p nfs-ganesha put "conf-$name" "$ganesha_dir/ganesha.conf"
-- 
2.39.5