commit c880fb41b05d94d7c9b5d3acca5ded9a13f14c66
author Jenkins <jenkins@review.openstack.org> Thu Mar 06 21:03:24 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 06 21:03:24 2014 +0000
tree bb9f2cfd9175b5efbb941f40a8ad9b4b88e88327
parent 82660c69145b4fe749ee1525a33226be084e6948
parent 961328fc4622b16135d6d580429dc3e5db01ded5

Merge "Fix marconi's storage setting for MongoDB"

lib/marconi

diff --git a/lib/marconi b/lib/marconi
index 29ae386..8f4f3c6 100644
--- a/lib/marconi
+++ b/lib/marconi
@@ -105,7 +105,8 @@
     iniset $MARCONI_CONF keystone_authtoken signing_dir $MARCONI_AUTH_CACHE_DIR
 
     if [[ "$MARCONI_BACKEND" = 'mongodb' ]]; then
-        iniset $MARCONI_CONF database connection mongodb://localhost:27017/marconi
+        iniset $MARCONI_CONF drivers storage mongodb
+        iniset $MARCONI_CONF 'drivers:storage:mongodb' uri mongodb://localhost:27017/marconi
         configure_mongodb
         cleanup_marconi
     fi