From f6966ebdfa7bf583095e99d2cb0953d9402576d3 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 24 Feb 2017 14:54:10 -0500
Subject: [PATCH] vstart.sh: fix init-ceph stop on vstart

Do this before the old ceph.conf is deleted!

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/vstart.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vstart.sh b/src/vstart.sh
index 717d4a3d992..81beaa8a2f9 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -290,6 +290,10 @@ esac
 shift
 done
 
+if [ "$start_all" -eq 1 ]; then
+    $SUDO $INIT_CEPH stop
+fi
+
 if [ "$overwrite_conf" -eq 0 ]; then
     MON=`$CEPH_BIN/ceph-conf -c $conf_fn --name $VSTART_SEC num_mon 2>/dev/null` && \
         CEPH_NUM_MON="$MON"
@@ -422,9 +426,6 @@ fi
 # sudo if btrfs
 test -d $CEPH_DEV_DIR/osd0/. && test -e $CEPH_DEV_DIR/sudo && SUDO="sudo"
 
-if [ "$start_all" -eq 1 ]; then
-    $SUDO $INIT_CEPH stop
-fi
 prun $SUDO rm -f core*
 
 test -d $CEPH_OUT_DIR || mkdir $CEPH_OUT_DIR
-- 
2.39.5