Merge "Make Ironic options definitions consistent"

nova/conf/ironic.py

@@ -2,7 +2,6 @@
 # needs:check_deprecation_status
 # needs:check_opt_group_and_type
 # needs:fix_opt_description_indentation
-# needs:fix_opt_registration_consistency
 
 
 # Copyright 2015 Intel Corporation
@@ -26,75 +25,56 @@ ironic_group = cfg.OptGroup(
     'ironic',
     title='Ironic Options')
 
-api_version = cfg.IntOpt(
-    'api_version',
-    default=1,
-    deprecated_for_removal=True,
-    help='Version of Ironic API service endpoint. '
-         'DEPRECATED: Setting the API version is not possible anymore.')
-
-api_endpoint = cfg.StrOpt(
-    'api_endpoint',
-    help='URL for Ironic API endpoint.')
-
-admin_username = cfg.StrOpt(
-    'admin_username',
-    help='Ironic keystone admin name')
-
-admin_password = cfg.StrOpt(
-    'admin_password',
-    secret=True,
-    help='Ironic keystone admin password.')
-
-admin_auth_token = cfg.StrOpt(
-    'admin_auth_token',
-    secret=True,
-    deprecated_for_removal=True,
-    help='Ironic keystone auth token.'
-         'DEPRECATED: use admin_username, admin_password, and '
-         'admin_tenant_name instead')
-
-admin_url = cfg.StrOpt(
-    'admin_url',
-    help='Keystone public API endpoint.')
-
-cafile = cfg.StrOpt(
-    'cafile',
-    help='PEM encoded Certificate Authority to use when verifying HTTPs '
-         'connections.')
-
-admin_tenant_name = cfg.StrOpt(
-    'admin_tenant_name',
-    help='Ironic keystone tenant name.')
-
-api_max_retries = cfg.IntOpt(
-    'api_max_retries',
-    default=60,
-    help=('How many retries when a request does conflict. '
-          'If <= 0, only try once, no retries.'))
-
-api_retry_interval = cfg.IntOpt(
-    'api_retry_interval',
-    default=2,
-    help='How often to retry in seconds when a request '
-         'does conflict')
-
-ALL_OPTS = [api_version,
-            api_endpoint,
-            admin_username,
-            admin_password,
-            admin_auth_token,
-            admin_url,
-            cafile,
-            admin_tenant_name,
-            api_max_retries,
-            api_retry_interval]
+ironic_options = [
+    cfg.IntOpt('api_version',
+        default=1,
+        deprecated_for_removal=True,
+        help='Version of Ironic API service endpoint. '
+             'DEPRECATED: Setting the API version is not possible anymore.'),
+    cfg.StrOpt(
+        'api_endpoint',
+        help='URL for Ironic API endpoint.'),
+    cfg.StrOpt(
+        'admin_username',
+        help='Ironic keystone admin name'),
+    cfg.StrOpt(
+        'admin_password',
+        secret=True,
+        help='Ironic keystone admin password.'),
+    cfg.StrOpt(
+        'admin_auth_token',
+        secret=True,
+        deprecated_for_removal=True,
+        help='Ironic keystone auth token.'
+             'DEPRECATED: use admin_username, admin_password, and '
+             'admin_tenant_name instead'),
+    cfg.StrOpt(
+        'admin_url',
+        help='Keystone public API endpoint.'),
+    cfg.StrOpt(
+        'cafile',
+        help='PEM encoded Certificate Authority to use when verifying HTTPs '
+             'connections.'),
+    cfg.StrOpt(
+        'admin_tenant_name',
+        help='Ironic keystone tenant name.'),
+    cfg.IntOpt(
+        'api_max_retries',
+        default=60,
+        help='How many retries when a request does conflict. '
+              'If <= 0, only try once, no retries.'),
+    cfg.IntOpt(
+        'api_retry_interval',
+        default=2,
+        help='How often to retry in seconds when a request '
+             'does conflict'),
+]
 
 
 def register_opts(conf):
     conf.register_group(ironic_group)
-    conf.register_opts(ALL_OPTS, group=ironic_group)
+    conf.register_opts(ironic_options, group=ironic_group)
 
 
 def list_opts():
-    return {ironic_group: ALL_OPTS}
+    return {ironic_group: ironic_options}