commit ca2465f70de7bdc1d3303f78a02f6738de7a7d6a
author Jenkins <jenkins@review.openstack.org> Thu Mar 05 08:48:30 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 05 08:48:30 2015 +0000
tree 41d1494ef6673452b017f18212ee8602fdcd5c1e
parent 38c8d84e2434d2e1f5b8b15527cd0d782aa57b32
parent ab7df5ea1d4bd579c97bc739d7b9893df1715845

Merge "Add cryptography to list if files to build before hand"

lib/ceph

diff --git a/lib/ceph b/lib/ceph
index a6b8cc8..76747cc 100644
--- a/lib/ceph
+++ b/lib/ceph
@@ -71,7 +71,7 @@
 CEPH_REPLICAS_SEQ=$(seq ${CEPH_REPLICAS})
 
 # Connect to an existing Ceph cluster
-REMOTE_CEPH=$(trueorfalse False $REMOTE_CEPH)
+REMOTE_CEPH=$(trueorfalse False REMOTE_CEPH)
 REMOTE_CEPH_ADMIN_KEY_PATH=${REMOTE_CEPH_ADMIN_KEY_PATH:-$CEPH_CONF_DIR/ceph.client.admin.keyring}
 
 
@@ -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}/*
 }