diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-14 22:29:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-14 22:29:28 +0000 |
| commit | 8fe00c545ea6e8a2b14f7a35b009b84dc0e2c29a (patch) | |
| tree | 90cd4cd2a842f38b06361dbf416d3fca49506474 | |
| parent | f40357574245d2e3b8cb7995cb27adc8e9b99175 (diff) | |
| parent | db3c63d199275b92f9106b275e76fdc1eb62d6ba (diff) | |
| download | nova-8fe00c545ea6e8a2b14f7a35b009b84dc0e2c29a.tar.gz nova-8fe00c545ea6e8a2b14f7a35b009b84dc0e2c29a.tar.xz nova-8fe00c545ea6e8a2b14f7a35b009b84dc0e2c29a.zip | |
Merge "Cleanup flags"
| -rw-r--r-- | nova/console/manager.py | 2 | ||||
| -rw-r--r-- | nova/flags.py | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nova/console/manager.py b/nova/console/manager.py index b384ff354..58ac2174b 100644 --- a/nova/console/manager.py +++ b/nova/console/manager.py @@ -37,7 +37,7 @@ console_manager_opts = [ help='Stub calls to compute worker for tests'), cfg.StrOpt('console_public_hostname', default=socket.gethostname(), - help='Publicly visable name for this console host'), + help='Publicly visible name for this console host'), ] FLAGS = flags.FLAGS 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'), |