Merge "Removed db_pool complexities from nova.db.sqlalchemy.session. Fixes bug 838581."
This commit is contained in:
		@@ -353,12 +353,6 @@ DEFINE_string('logdir', None, 'output to a per-service log file in named '
 | 
			
		||||
                              'directory')
 | 
			
		||||
DEFINE_integer('logfile_mode', 0644, 'Default file mode of the logs.')
 | 
			
		||||
DEFINE_string('sqlite_db', 'nova.sqlite', 'file name for sqlite')
 | 
			
		||||
DEFINE_integer('sql_pool_timeout', 30,
 | 
			
		||||
               'seconds to wait for connection from pool before erroring')
 | 
			
		||||
DEFINE_integer('sql_min_pool_size', 10,
 | 
			
		||||
               'minimum number of SQL connections to pool')
 | 
			
		||||
DEFINE_integer('sql_max_pool_size', 10,
 | 
			
		||||
               'maximum number of SQL connections to pool')
 | 
			
		||||
DEFINE_string('sql_connection',
 | 
			
		||||
              'sqlite:///$state_path/$sqlite_db',
 | 
			
		||||
              'connection string for sql database')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user