From 0fdf34959eb8f330301adfcd0ab1cfe975b5460c Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Tue, 3 Mar 2015 16:37:35 +0000 Subject: [PATCH] Don't cleanup ceph config when REMOTE_CEPH=True If REMOTE_CEPH=True then we didn't write the contents of /etc/ceph, so we shouldn't delete them. Change-Id: I6291c6562a2864de775b1acb4be0be35b866f30d --- lib/ceph | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ceph b/lib/ceph index 251cfd1449..76747ccd77 100644 --- a/lib/ceph +++ b/lib/ceph @@ -151,14 +151,14 @@ function cleanup_ceph_embedded { 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}/* }