From: Varsha Rao <varao@redhat.com>
Date: Mon, 4 May 2020 14:13:12 +0000 (+0530)
Subject: vstart: Ensure cephadm and NFS does not conflict
X-Git-Tag: v15.2.5~166^2~57
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a26b646068dca093c02e18ae048e58558b14b964;p=ceph.git

vstart: Ensure cephadm and NFS does not conflict

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 31767428fc36f34331b75dd899ed0b9ae6b3ecaf)
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 9e459c875805..ceeb91145de0 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1360,7 +1360,7 @@ EOF
 fi
 
 # Ganesha Daemons
-if [ $GANESHA_DAEMON_NUM -gt 0 ]; then
+if [ $GANESHA_DAEMON_NUM -gt 0 ] && [ "$cephadm" -eq 0 ]; then
     start_ganesha
 fi