summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorArmando Migliaccio <armando.migliaccio@citrix.com>2011-02-17 19:49:48 +0000
committerArmando Migliaccio <armando.migliaccio@citrix.com>2011-02-17 19:49:48 +0000
commit43df95d1d8a4e8de094ca0a430eb7ac913803f8f (patch)
tree70e81ce941cb05041db623e69c6823dc26e23d00 /nova/flags.py
parent39ffe46a749ad8f4a390f8e4c36c871845af2fc0 (diff)
parent35e2d24e4bdaf2d72155114b7e97821c8a4696d1 (diff)
Rebased at lp:nova 688
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 1d8eba94f..f64a62da9 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -282,12 +282,14 @@ DEFINE_integer('auth_token_ttl', 3600, 'Seconds for auth tokens to linger')
DEFINE_string('state_path', os.path.join(os.path.dirname(__file__), '../'),
"Top-level directory for maintaining nova's state")
+DEFINE_string('logdir', None, 'output to a per-service log file in named '
+ 'directory')
DEFINE_string('sql_connection',
'sqlite:///$state_path/nova.sqlite',
'connection string for sql database')
-DEFINE_string('sql_idle_timeout',
- '3600',
+DEFINE_integer('sql_idle_timeout',
+ 3600,
'timeout for idle sql database connections')
DEFINE_integer('sql_max_retries', 12, 'sql connection attempts')
DEFINE_integer('sql_retry_interval', 10, 'sql connection retry interval')