]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart: Ensure cephadm and NFS does not conflict
authorVarsha Rao <varao@redhat.com>
Mon, 4 May 2020 14:13:12 +0000 (19:43 +0530)
committerVarsha Rao <varao@redhat.com>
Fri, 29 May 2020 09:17:32 +0000 (14:47 +0530)
Signed-off-by: Varsha Rao <varao@redhat.com>
src/vstart.sh

index f28ae8c2c319e2f0773795e8da93f591c40a8205..aac94848ab51eac943aa60c775843d679e67fa5e 100755 (executable)
@@ -1367,7 +1367,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