diff options
| author | Eric Windisch <eric@cloudscaling.com> | 2013-01-17 15:38:02 -0500 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-02-05 10:13:04 +0000 |
| commit | cd0c765ced2823c05b16126d6ba6a823bb66fe7d (patch) | |
| tree | 31b3e5535d39db7afaefa12a89d74b68b7885ced /nova/config.py | |
| parent | 47bbf12a6c9705e5abca29a1d44b753c8506505d (diff) | |
| download | nova-cd0c765ced2823c05b16126d6ba6a823bb66fe7d.tar.gz nova-cd0c765ced2823c05b16126d6ba6a823bb66fe7d.tar.xz nova-cd0c765ced2823c05b16126d6ba6a823bb66fe7d.zip | |
Use oslo database code
Bring in the new database code from oslo.
Uses get_session() from oslo as well as changing NovaBase to derive from
a common class.
Remove test_sqlalchemy.py now that this code is test in oslo.
Implements blueprint db-common.
Change-Id: I090754981c871250dd981cbbe1a08e7181440120
Diffstat (limited to 'nova/config.py')
| -rw-r--r-- | nova/config.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/config.py b/nova/config.py index 4095dba75..18147bdbb 100644 --- a/nova/config.py +++ b/nova/config.py @@ -18,10 +18,16 @@ # under the License. from nova.openstack.common import cfg +from nova.openstack.common.db.sqlalchemy import session as db_session from nova.openstack.common import rpc +from nova import paths + +_DEFAULT_SQL_CONNECTION = 'sqlite:///' + paths.state_path_def('$sqlite_db') def parse_args(argv, default_config_files=None): + db_session.set_defaults(sql_connection=_DEFAULT_SQL_CONNECTION, + sqlite_db='nova.sqlite') rpc.set_defaults(control_exchange='nova') cfg.CONF(argv[1:], project='nova', |