From 3d65ac342fd5a417c27a84857b41746886e88c6c Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Fri, 15 Jan 2016 14:14:20 +0000
Subject: [PATCH] Stop daemons before cleanup in unstack

The cleanup_ceph_embedded function nukes the ceph
conf directories, so when subsequently trying
to stop services they aren't stopped.  Next stack.sh
run will fail because daemons are still running.

Fix by stopping daemons before running cleanup.

Change-Id: I51cd58eae83171a47aa898b65240b72ea0217af9
Closes-Bug: #1534600
---
 devstack/plugin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 7aaf7dc..5348b45 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -82,8 +82,8 @@ if [[ "$1" == "unstack" ]]; then
     if [ "$REMOTE_CEPH" = "True" ]; then
         cleanup_ceph_remote
     else
-        cleanup_ceph_embedded
         stop_ceph
+        cleanup_ceph_embedded
     fi
     cleanup_ceph_general
 fi