summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2012-03-13 18:03:28 -0700
committerJoe Gordon <jogo@cloudscaling.com>2012-03-13 18:05:04 -0700
commitdb3c63d199275b92f9106b275e76fdc1eb62d6ba (patch)
tree5c434e991875f87e48314e715f413839f31b69e9 /nova/flags.py
parent78a067e9d3b848067b933d58a2abecc96753bc36 (diff)
downloadnova-db3c63d199275b92f9106b275e76fdc1eb62d6ba.tar.gz
nova-db3c63d199275b92f9106b275e76fdc1eb62d6ba.tar.xz
nova-db3c63d199275b92f9106b275e76fdc1eb62d6ba.zip
Cleanup flags
sql_max_retries: removed (unused) instance_usage_audit_period: fixed help default_schedule_zone: fixed help Change-Id: I952b38497987780d30622fef526edd2d53860f99
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 38c2258c2..e88ec7da2 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -321,10 +321,6 @@ global_opts = [
cfg.IntOpt('sql_idle_timeout',
default=3600,
help='timeout before idle sql connections are reaped'),
- cfg.IntOpt('sql_max_retries',
- default=12,
- help='maximum number of retries for connecting to the sql '
- 'database'),
cfg.IntOpt('sql_retry_interval',
default=10,
help='interval between retries of opening a sql connection'),
@@ -391,7 +387,8 @@ global_opts = [
help='Memcached servers or None for in process cache.'),
cfg.StrOpt('instance_usage_audit_period',
default='month',
- help='time period to generate instance usages for.'),
+ help='time period to generate instance usages for. '
+ 'Time period must be hour, day, month or year'),
cfg.IntOpt('bandwith_poll_interval',
default=600,
help='interval to pull bandwidth usage info'),
@@ -449,7 +446,7 @@ global_opts = [
help='maximum time since last check-in for up service'),
cfg.StrOpt('default_schedule_zone',
default=None,
- help='availability zone to use when user doesnt specify one'),
+ help='availability zone to use when user doesn\'t specify one'),
cfg.ListOpt('isolated_images',
default=[],
help='Images to run on isolated host'),