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 49265239f83fb514644333f8ea82e63f9bb07621..9bcf47e040b9c92f8e371cbbb4906012cc8d9180 100644 (file)
--- 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