openstack/devstack
Code Issues Proposed changes

Don't cleanup ceph config when REMOTE_CEPH=True

Browse Source 
If REMOTE_CEPH=True then we didn't write the contents of /etc/ceph, so
we shouldn't delete them.

Change-Id: I6291c6562a2864de775b1acb4be0be35b866f30d
This commit is contained in:
Matthew Booth 2015-03-03 16:37:35 +00:00
parent e3ceaedbd7
commit 0fdf34959e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ceph
View File

@ -151,14 +151,14 @@ function cleanup_ceph_embedded {
if [[ -e ${CEPH_DISK_IMAGE} ]]; then if [[ -e ${CEPH_DISK_IMAGE} ]]; then
sudo rm -f ${CEPH_DISK_IMAGE} sudo rm -f ${CEPH_DISK_IMAGE}
fi fi
# purge ceph config file and keys
sudo rm -rf ${CEPH_CONF_DIR}/*
} }
function cleanup_ceph_general { function cleanup_ceph_general {
undefine_virsh_secret undefine_virsh_secret
uninstall_package ceph ceph-common python-ceph libcephfs1 > /dev/null 2>&1 uninstall_package ceph ceph-common python-ceph libcephfs1 > /dev/null 2>&1
# purge ceph config file and keys
sudo rm -rf ${CEPH_CONF_DIR}/*
} }