From 43e3e2af5fd3120ebae41755df4da15017f99261 Mon Sep 17 00:00:00 2001
From: Varsha Rao <varao@redhat.com>
Date: Wed, 3 Feb 2021 14:09:47 +0530
Subject: [PATCH] vstart: Fix nfs-ganesha RADOS_URLS config block not found
 warning

Reordering the config blocks fixes the rados url error and removing 'ganesha-'
prefix from rados config object fixes the config file error.

Fixes: https://tracker.ceph.com/issues/49122
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 19187a8a154a6af95b3669cc9fd45b3922232cae)
---
 src/vstart.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vstart.sh b/src/vstart.sh
index e1227def7a578..10fecde7553fb 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1126,7 +1126,7 @@ start_ganesha() {
     cluster_id="vstart"
     GANESHA_PORT=$(($CEPH_PORT + 4000))
     local ganesha=0
-    test_user="ganesha-$cluster_id"
+    test_user="$cluster_id"
     pool_name="nfs-ganesha"
     namespace=$cluster_id
     url="rados://$pool_name/$namespace/conf-nfs.$test_user"
@@ -1169,8 +1169,6 @@ start_ganesha() {
            Minor_Versions = 1, 2;
         }
 
-        %url $url
-
         RADOS_KV {
            pool = $pool_name;
            namespace = $namespace;
@@ -1180,8 +1178,10 @@ start_ganesha() {
 
         RADOS_URLS {
 	   Userid = $test_user;
-	   watch_url = \"$url\";
-        }" > "$ganesha_dir/ganesha-$name.conf"
+	   watch_url = '$url';
+        }
+
+	%url $url" > "$ganesha_dir/ganesha-$name.conf"
 	wconf <<EOF
 [ganesha.$name]
         host = $HOSTNAME
-- 
2.39.5