Manila: clean pools unconditionally
Cleanup of CephFS data and metadata pools for manila was only being done for external CephFS installs. Do it whenever manila is enabled. Change-Id: Iee238f91b04231d1e41774a49615023fe26e56f3
This commit is contained in:
parent
04871bee0c
commit
1c9e3e772e
|
@ -352,15 +352,6 @@ function cleanup_ceph_remote {
|
|||
sudo ceph -c ${CEPH_CONF_FILE} osd pool delete $NOVA_CEPH_POOL $NOVA_CEPH_POOL \
|
||||
--yes-i-really-really-mean-it > /dev/null 2>&1
|
||||
fi
|
||||
if is_ceph_enabled_for_service manila; then
|
||||
sudo ceph -c ${CEPH_CONF_FILE} fs rm $CEPHFS_FILESYSTEM \
|
||||
--yes-i-really-mean-it
|
||||
sudo ceph -c ${CEPH_CONF_FILE} osd pool delete $CEPHFS_METADATA_POOL $CEPHFS_METADATA_POOL \
|
||||
--yes-i-really-really-mean-it > /dev/null 2>&1
|
||||
sudo ceph -c ${CEPH_CONF_FILE} osd pool delete $CEPHFS_DATA_POOL $CEPHFS_DATA_POOL \
|
||||
--yes-i-really-really-mean-it > /dev/null 2>&1
|
||||
sudo ceph -c ${CEPH_CONF_FILE} auth del client.$MANILA_CEPH_USER > /dev/null 2>&1
|
||||
fi
|
||||
}
|
||||
|
||||
function cleanup_ceph_embedded {
|
||||
|
@ -391,6 +382,15 @@ function cleanup_ceph_general {
|
|||
if is_ceph_enabled_for_service manila && [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then
|
||||
cleanup_nfs_ganesha
|
||||
fi
|
||||
if is_ceph_enabled_for_service manila; then
|
||||
sudo ceph -c ${CEPH_CONF_FILE} fs rm $CEPHFS_FILESYSTEM \
|
||||
--yes-i-really-mean-it
|
||||
sudo ceph -c ${CEPH_CONF_FILE} osd pool delete $CEPHFS_METADATA_POOL $CEPHFS_METADATA_POOL \
|
||||
--yes-i-really-really-mean-it > /dev/null 2>&1
|
||||
sudo ceph -c ${CEPH_CONF_FILE} osd pool delete $CEPHFS_DATA_POOL $CEPHFS_DATA_POOL \
|
||||
--yes-i-really-really-mean-it > /dev/null 2>&1
|
||||
sudo ceph -c ${CEPH_CONF_FILE} auth del client.$MANILA_CEPH_USER > /dev/null 2>&1
|
||||
fi
|
||||
}
|
||||
|
||||
function cleanup_containerized_ceph {
|
||||
|
|
Loading…
Reference in New Issue