summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-08-12 10:34:45 -0500
committerJosh Kearney <josh@jk0.org>2011-08-12 10:34:45 -0500
commit712cfc91c773107e1e5d3fe201e7ef9dbe1f6473 (patch)
tree5730b9a33dfeaa42e0664919245a0cb717758d5e /nova/flags.py
parent9402b5cdcdac0ca88d3d51c5c382baaba9dc055f (diff)
parent1f116df9b65fc317db26492115bc36ce465ba296 (diff)
Merged trunk.
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 7916501a4..e994a1665 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -345,6 +345,12 @@ 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')