devstack: prefix _drop_database
This avoids any possible conflict with another function named the same. Change-Id: Ib3ad175d1150e54676f0f0ea7381ec96cf5e8ab4
This commit is contained in:
parent
cd2e0418c7
commit
c8538776d4
@ -196,7 +196,7 @@ function _ceilometer_cleanup_apache_wsgi {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function _drop_database {
|
function _ceilometer_drop_database {
|
||||||
if is_service_enabled ceilometer-collector ceilometer-api ; then
|
if is_service_enabled ceilometer-collector ceilometer-api ; then
|
||||||
if [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then
|
if [ "$CEILOMETER_BACKEND" = 'mongodb' ] ; then
|
||||||
mongo ceilometer --eval "db.dropDatabase();"
|
mongo ceilometer --eval "db.dropDatabase();"
|
||||||
@ -210,7 +210,7 @@ function _drop_database {
|
|||||||
# from previous runs that a clean run would need to clean up
|
# from previous runs that a clean run would need to clean up
|
||||||
function cleanup_ceilometer {
|
function cleanup_ceilometer {
|
||||||
_ceilometer_cleanup_apache_wsgi
|
_ceilometer_cleanup_apache_wsgi
|
||||||
_drop_database
|
_ceilometer_drop_database
|
||||||
sudo rm -f "$CEILOMETER_CONF_DIR"/*
|
sudo rm -f "$CEILOMETER_CONF_DIR"/*
|
||||||
sudo rmdir "$CEILOMETER_CONF_DIR"
|
sudo rmdir "$CEILOMETER_CONF_DIR"
|
||||||
}
|
}
|
||||||
@ -264,7 +264,7 @@ function _ceilometer_configure_storage_backend {
|
|||||||
else
|
else
|
||||||
die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
|
die $LINENO "Unable to configure unknown CEILOMETER_BACKEND $CEILOMETER_BACKEND"
|
||||||
fi
|
fi
|
||||||
_drop_database
|
_ceilometer_drop_database
|
||||||
}
|
}
|
||||||
|
|
||||||
# Configure Ceilometer
|
# Configure Ceilometer
|
||||||
|
Loading…
Reference in New Issue
Block a user