openstack/devstack
Code Issues Proposed changes

Merge "Add support for sqlalchemy to Marconi"

Browse Source
This commit is contained in:
Jenkins
2014-03-08 13:25:15 +00:00
committed by Gerrit Code Review
parent fb166c3d97 5fc5b7e231
commit a6863b346c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/marconi
View File

@@ -104,7 +104,10 @@ function configure_marconi {
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