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
This commit is contained in:
		
				
					committed by
					
						
						Mark McLoughlin
					
				
			
			
				
	
			
			
			
						parent
						
							47bbf12a6c
						
					
				
				
					commit
					cd0c765ced
				
			@@ -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',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user