openstack/devstack
Code Issues Proposed changes

Merge "Clean database when configuring ceilmeter."

Browse Source
This commit is contained in:
Jenkins 2012-10-29 13:45:30 +00:00 committed by Gerrit Code Review
commit 420ff07070
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ceilometer
View File

@ -41,8 +41,7 @@ CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api
# cleanup_ceilometer() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up
function cleanup_ceilometer() {
# This function intentionally left blank
:
mongo ceilometer --eval "db.dropDatabase();"
}
# configure_ceilometer() - Set config files, create data dirs, etc
@ -63,6 +62,7 @@ function configure_ceilometer() {
iniset $CEILOMETER_CONF DEFAULT sql_connection $BASE_SQL_CONN/nova?charset=utf8
iniset $CEILOMETER_CONF keystone_authtoken auth_protocol http
cleanup_ceilometer
}
# install_ceilometer() - Collect source and prepare