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

This commit is contained in:
Jenkins
2015-03-05 04:40:48 +00:00
committed by Gerrit Code Review

View File

@@ -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}/*
}