From: Adam Gandelman <adamg@canonical.com>
Date: Tue, 11 Jun 2013 21:50:01 +0000 (-0700)
Subject: Re-set default sql_connection and sqlite_db.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=57cdb8f8c36a4835c918d9644bc26f41d0c0045a;p=openstack-build%2Fcinder-build.git

Re-set default sql_connection and sqlite_db.

The defaults seem to have been lost in the migration to Oslo's
DB code.  Re-set them to pre-grizzly defaults.

Fixes bug: #1190036

Change-Id: I7fca70e67d67905b15c2faaa745a86e957bec06e
---

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index 49265239f..9bcf47e04 100644
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -46,6 +46,9 @@ from cinder.openstack.common import uuidutils
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
+db_session.set_defaults(sql_connection='sqlite:///$state_path/$sqlite_db',
+                        sqlite_db='cinder.sqlite')
+
 get_engine = db_session.get_engine
 get_session = db_session.get_session