commit 38c8d84e2434d2e1f5b8b15527cd0d782aa57b32
author Jenkins <jenkins@review.openstack.org> Thu Mar 05 04:40:48 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 05 04:40:48 2015 +0000
tree 85ca74211f0fff7dd9c97cdf6b8ec35957cd939e
parent 8ce048583052c98631375479c25a54db36ce67ad
parent 0fdf34959eb8f330301adfcd0ab1cfe975b5460c

Merge "Don't cleanup ceph config when REMOTE_CEPH=True"

lib/ceph

diff --git a/lib/ceph b/lib/ceph
index 251cfd1..76747cc 100644
--- a/lib/ceph
+++ b/lib/ceph
@@ -151,14 +151,14 @@
     if [[ -e ${CEPH_DISK_IMAGE} ]]; then
         sudo rm -f ${CEPH_DISK_IMAGE}
     fi
+
+    # purge ceph config file and keys
+    sudo rm -rf ${CEPH_CONF_DIR}/*
 }
 
 function cleanup_ceph_general {
     undefine_virsh_secret
     uninstall_package ceph ceph-common python-ceph libcephfs1 > /dev/null 2>&1
-
-    # purge ceph config file and keys
-    sudo rm -rf ${CEPH_CONF_DIR}/*
 }