If REMOTE_CEPH=True then we didn't write the contents of /etc/ceph, so
we shouldn't delete them.
Change-Id: I6291c6562a2864de775b1acb4be0be35b866f30d
| ... | ... |
@@ -151,14 +151,14 @@ function cleanup_ceph_embedded {
|
| 151 | 151 |
if [[ -e ${CEPH_DISK_IMAGE} ]]; then
|
| 152 | 152 |
sudo rm -f ${CEPH_DISK_IMAGE}
|
| 153 | 153 |
fi |
| 154 |
+ |
|
| 155 |
+ # purge ceph config file and keys |
|
| 156 |
+ sudo rm -rf ${CEPH_CONF_DIR}/*
|
|
| 154 | 157 |
} |
| 155 | 158 |
|
| 156 | 159 |
function cleanup_ceph_general {
|
| 157 | 160 |
undefine_virsh_secret |
| 158 | 161 |
uninstall_package ceph ceph-common python-ceph libcephfs1 > /dev/null 2>&1 |
| 159 |
- |
|
| 160 |
- # purge ceph config file and keys |
|
| 161 |
- sudo rm -rf ${CEPH_CONF_DIR}/*
|
|
| 162 | 162 |
} |
| 163 | 163 |
|
| 164 | 164 |
|