openstack/rally
Code Issues Proposed changes

Merge "install_rally.sh: permit absolute paths for sqlite db name"

Browse Source
This commit is contained in:
Jenkins 2015-06-24 19:35:43 +00:00 committed by Gerrit Code Review
commit a34b2d906a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install_rally.sh
View File

@ -576,8 +576,13 @@ then
RALLY_DATABASE_DIR="$VENVDIR"/database RALLY_DATABASE_DIR="$VENVDIR"/database
fi fi
if [ "$DBTYPE" != 'sqlite' ] if [ "$DBTYPE" = 'sqlite' ]; then
then if [ "${DBNAME:0:1}" = '/' ]; then
DBCONNSTRING="$DBTYPE:///$DBNAME"
else
DBCONNSTRING="$DBTYPE:///${RALLY_DATABASE_DIR}/${DBNAME}"
fi
else
if [ -z "$DBUSER" -o -z "$DBPASSWORD" -o -z "$DBHOST" -o -z "$DBNAME" ] if [ -z "$DBUSER" -o -z "$DBPASSWORD" -o -z "$DBHOST" -o -z "$DBNAME" ]
then then
die $EX_USAGE "Missing mandatory options" <<__EOF__ die $EX_USAGE "Missing mandatory options" <<__EOF__
@ -595,8 +600,6 @@ __EOF__
fi fi
DBAUTH="$DBUSER:$DBPASSWORD@$DBHOST" DBAUTH="$DBUSER:$DBPASSWORD@$DBHOST"
DBCONNSTRING="$DBTYPE://$DBAUTH/$DBNAME" DBCONNSTRING="$DBTYPE://$DBAUTH/$DBNAME"
else
DBCONNSTRING="$DBTYPE:///${RALLY_DATABASE_DIR}/${DBNAME}"
fi fi
# check and install prerequisites # check and install prerequisites