commit 5fc5b7e231710c2d67522d1bcabdc448dadd0f94
author Flavio Percoco <flaper87@gmail.com> Wed Mar 05 18:49:02 2014 +0100
committer Flavio Percoco <flaper87@gmail.com> Wed Mar 05 21:14:46 2014 +0100
tree 48aa9dfcca8b9d41a1cb34a01b620d7556ccc53b
parent 961328fc4622b16135d6d580429dc3e5db01ded5

Add support for sqlalchemy to Marconi

This patch adds a way to setup a marconi instance using sqlalchemy.

Change-Id: Ia694b76286835ca2ca935814370aa43544fe84fa

lib/marconi

diff --git a/lib/marconi b/lib/marconi
index 8f4f3c6..1e0cc7d 100644
--- a/lib/marconi
+++ b/lib/marconi
@@ -104,7 +104,10 @@
     iniset $MARCONI_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
     iniset $MARCONI_CONF keystone_authtoken signing_dir $MARCONI_AUTH_CACHE_DIR
 
-    if [[ "$MARCONI_BACKEND" = 'mongodb' ]]; then
+    if [ "$MARCONI_BACKEND" = 'mysql' ] || [ "$MARCONI_BACKEND" = 'postgresql' ] ; then
+        iniset $MARCONI_CONF drivers storage sqlalchemy
+        iniset $MARCONI_CONF 'drivers:storage:sqlalchemy' uri `database_connection_url marconi`
+    else
         iniset $MARCONI_CONF drivers storage mongodb
         iniset $MARCONI_CONF 'drivers:storage:mongodb' uri mongodb://localhost:27017/marconi
         configure_mongodb