Merge "Cleanup flags"

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

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'),