]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
src/vstart: Set CEPH_CONF environment variables
authorVarsha Rao <varao@redhat.com>
Thu, 5 Mar 2020 09:56:03 +0000 (15:26 +0530)
committerVarsha Rao <varao@redhat.com>
Wed, 8 Jul 2020 05:36:34 +0000 (07:36 +0200)
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 751a994f6798bcf0b8e2de7a9dfed330c84702fa)

src/vstart.sh

index 90d2245778f687c32f92eaeb2f392698255e012c..bcee95d751f3947437daed00517f330a4bb7aca4 100755 (executable)
@@ -1099,7 +1099,7 @@ EOF
         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
+        prun env CEPH_CONF="${conf_fn}" /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