openstack
/
devstack
Code Issues Proposed changes

Merge "Use Mongo DB as the default backend"

This commit is contained in:
Jenkins 2014-08-07 15:05:22 +00:00 committed by Gerrit Code Review
parent fdfe7a010e f7ae9ff5dd
commit 1dde567e75
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)
# Set up database backend
MARCONI_BACKEND=${MARCONI_BACKEND:-sqlite}
MARCONI_BACKEND=${MARCONI_BACKEND:-mongodb}
# Set Marconi repository
@ -77,6 +77,13 @@ function is_marconi_enabled {
function cleanup_marconi {
if ! timeout $SERVICE_TIMEOUT sh -c "while ! mongo marconi --eval 'db.dropDatabase();'; do sleep 1; done"; then
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
}