Merge "Make the base options definitions consistent"

nova/conf/base.py

@@ -17,39 +17,33 @@
 
 from oslo_config import cfg
 
+notify_decorator = 'nova.notifications.notify_decorator'
 
-password_length = cfg.IntOpt(
-    'password_length',
-    default=12,
-    help='Length of generated instance admin passwords')
-
-instance_usage_audit_period = cfg.StrOpt(
-    'instance_usage_audit_period',
-    default='month',
-    help='Time period to generate instance usages for.  '
-         'Time period must be hour, day, month or year')
-
-use_rootwrap_daemon = cfg.BoolOpt(
-    'use_rootwrap_daemon',
-    default=False,
-    help="Start and use a daemon that can run the commands that "
-    "need to be run with root privileges. This option is "
-    "usually enabled on nodes that run nova compute "
-    "processes")
-
-rootwrap_config = cfg.StrOpt('rootwrap_config',
-    default="/etc/nova/rootwrap.conf",
-    help='Path to the rootwrap configuration file to use for '
-    'running commands as root')
-
-tempdir = cfg.StrOpt(
-    'tempdir',
-    help='Explicitly specify the temporary working directory')
-
-monkey_patch = cfg.BoolOpt(
-    'monkey_patch',
-    default=False,
-    help="""Determine if monkey patching should be applied.
+base_options = [
+    cfg.IntOpt('password_length',
+        default=12,
+        help='Length of generated instance admin passwords'),
+    cfg.StrOpt('instance_usage_audit_period',
+        default='month',
+        help='Time period to generate instance usages for.  '
+             'Time period must be hour, day, month or year'),
+    cfg.BoolOpt('use_rootwrap_daemon',
+        default=False,
+        help="Start and use a daemon that can run the commands that "
+        "need to be run with root privileges. This option is "
+        "usually enabled on nodes that run nova compute "
+        "processes"),
+    cfg.StrOpt('rootwrap_config',
+        default="/etc/nova/rootwrap.conf",
+        help='Path to the rootwrap configuration file to use for '
+        'running commands as root'),
+    cfg.StrOpt(
+        'tempdir',
+        help='Explicitly specify the temporary working directory'),
+    cfg.BoolOpt(
+        'monkey_patch',
+        default=False,
+        help="""Determine if monkey patching should be applied.
 
 Possible values:
 
@@ -64,16 +58,13 @@ Interdependencies to other options:
 
 * ``monkey_patch_modules``: This must have values set for this option to have
   any effect
-""")
-
-notify_decorator = 'nova.notifications.notify_decorator'
-
-monkey_patch_modules = cfg.ListOpt(
-    'monkey_patch_modules',
-    default=[
-        'nova.compute.api:%s' % (notify_decorator)
-    ],
-    help="""List of modules/decorators to monkey patch.
+"""),
+    cfg.ListOpt(
+        'monkey_patch_modules',
+        default=[
+            'nova.compute.api:%s' % (notify_decorator)
+        ],
+        help="""List of modules/decorators to monkey patch.
 
 This option allows you to patch a decorator for all functions in specified
 modules.
@@ -88,22 +79,13 @@ Interdependencies to other options:
 
 * ``monkey_patch``: This must be set to ``True`` for this option to
   have any effect
-""")
-
-
-ALL_OPTS = [
-    password_length,
-    instance_usage_audit_period,
-    use_rootwrap_daemon,
-    rootwrap_config,
-    tempdir,
-    monkey_patch,
-    monkey_patch_modules]
+"""),
+]
 
 
 def register_opts(conf):
-    conf.register_opts(ALL_OPTS)
+    conf.register_opts(base_options)
 
 
 def list_opts():
-    return {'DEFAULT': ALL_OPTS}
+    return {'DEFAULT': base_options}