Browse code

Merge "Clean database when configuring ceilmeter."

Jenkins authored on 2012/10/29 22:45:30
Showing 1 changed files
... ...
@@ -41,8 +41,7 @@ CEILOMETER_API_LOG_DIR=/var/log/ceilometer-api
41 41
 # cleanup_ceilometer() - Remove residual data files, anything left over from previous
42 42
 # runs that a clean run would need to clean up
43 43
 function cleanup_ceilometer() {
44
-    # This function intentionally left blank
45
-    :
44
+    mongo ceilometer --eval "db.dropDatabase();"
46 45
 }
47 46
 
48 47
 # configure_ceilometer() - Set config files, create data dirs, etc
... ...
@@ -63,6 +62,7 @@ function configure_ceilometer() {
63 63
     iniset $CEILOMETER_CONF DEFAULT sql_connection $BASE_SQL_CONN/nova?charset=utf8
64 64
 
65 65
     iniset $CEILOMETER_CONF keystone_authtoken auth_protocol http
66
+    cleanup_ceilometer
66 67
 }
67 68
 
68 69
 # install_ceilometer() - Collect source and prepare