openstack/devstack
Code Issues Proposed changes

Use Mongo DB as the default backend

Browse Source 
With the gate upgrade to Trusty, Marconi should now be able to run with
Mongo DB at the gate.

Change-Id: I7bfe25d42c9429606ee209860685077806eb6756
This commit is contained in:
Malini Kamalambal 2014-06-26 12:50:26 -04:00
parent 829f1b731b
commit f7ae9ff5dd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/marconi
View File

@ -42,7 +42,7 @@ MARCONI_AUTH_CACHE_DIR=${MARCONI_AUTH_CACHE_DIR:-/var/cache/marconi}
MARCONI_BIN_DIR=$(get_python_exec_prefix) MARCONI_BIN_DIR=$(get_python_exec_prefix)
# Set up database backend # Set up database backend
MARCONI_BACKEND=${MARCONI_BACKEND:-sqlite} MARCONI_BACKEND=${MARCONI_BACKEND:-mongodb}
# Set Marconi repository # Set Marconi repository
@ -77,6 +77,13 @@ function is_marconi_enabled {
function cleanup_marconi { function cleanup_marconi {
if ! timeout $SERVICE_TIMEOUT sh -c "while ! mongo marconi --eval 'db.dropDatabase();'; do sleep 1; done"; then if ! timeout $SERVICE_TIMEOUT sh -c "while ! mongo marconi --eval 'db.dropDatabase();'; do sleep 1; done"; then
die $LINENO "Mongo DB did not start" die $LINENO "Mongo DB did not start"
else
full_version=$(mongo marconi --eval 'db.dropDatabase();')
mongo_version=`echo $full_version | cut -d' ' -f4`
required_mongo_version='2.2'
if [[ $mongo_version < $required_mongo_version ]]; then
die $LINENO "Marconi needs Mongo DB version >= 2.2 to run."
fi
fi fi
} }