Merge "conf: Trivial fix of indentation in 'api'"

nova/conf/api.py

@@ -15,25 +15,27 @@
 
 from oslo_config import cfg
 
-api_group = cfg.OptGroup('api', title='API options', help="""
+api_group = cfg.OptGroup('api',
+    title='API options',
+    help="""
 Options under this group are used to define Nova API.
 """)
 
 auth_opts = [
     cfg.StrOpt("auth_strategy",
-            default="keystone",
-            choices=("keystone", "noauth2"),
-            deprecated_group="default",
-            help="""
+        default="keystone",
+        choices=("keystone", "noauth2"),
+        deprecated_group="default",
+        help="""
 This determines the strategy to use for authentication: keystone or noauth2.
 'noauth2' is designed for testing only, as it does no actual credential
 checking. 'noauth2' provides administrative credentials only if 'admin' is
 specified as the username.
 """),
     cfg.BoolOpt("use_forwarded_for",
-            default=False,
-            deprecated_group="default",
-            help="""
+        default=False,
+        deprecated_group="default",
+        help="""
 When True, the 'X-Forwarded-For' header is treated as the canonical remote
 address. When False (the default), the 'remote_address' header is used.
 
@@ -43,10 +45,10 @@ You should only enable this if you have an HTML sanitizing proxy.
 
 metadata_opts = [
     cfg.StrOpt("config_drive_skip_versions",
-            default=("1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 "
-                     "2007-12-15 2008-02-01 2008-09-01"),
-            deprecated_group="default",
-            help="""
+        default=("1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 "
+                 "2007-12-15 2008-02-01 2008-09-01"),
+        deprecated_group="default",
+        help="""
 When gathering the existing metadata for a config drive, the EC2-style
 metadata is returned for all versions that don't appear in this option.
 As of the Liberty release, the available versions are:
@@ -69,9 +71,9 @@ Possible values:
 * Any string that represents zero or more versions, separated by spaces.
 """),
     cfg.ListOpt('vendordata_providers',
-                default=[],
-                deprecated_group="default",
-                help="""
+        default=[],
+        deprecated_group="default",
+        help="""
 A list of vendordata providers.
 
 vendordata providers are how deployers can provide metadata via configdrive
@@ -103,9 +105,9 @@ Related options:
 * vendordata_dynamic_read_timeout
 """),
     cfg.ListOpt('vendordata_dynamic_targets',
-                default=[],
-                deprecated_group="default",
-                help="""
+        default=[],
+        deprecated_group="default",
+        help="""
 A list of targets for the dynamic vendordata provider. These targets are of
 the form <name>@<url>.
 
@@ -114,9 +116,9 @@ services and querying them for information about the instance. This behaviour
 is documented in the vendordata.rst file in the nova developer reference.
 """),
     cfg.StrOpt('vendordata_dynamic_ssl_certfile',
-               default='',
-               deprecated_group="default",
-               help="""
+        default='',
+        deprecated_group="default",
+        help="""
 Path to an optional certificate file or CA bundle to verify dynamic
 vendordata REST services ssl certificates against.
 
@@ -132,10 +134,10 @@ Related options:
 * vendordata_dynamic_read_timeout
 """),
     cfg.IntOpt('vendordata_dynamic_connect_timeout',
-               default=5,
-               min=3,
-               deprecated_group="default",
-               help="""
+        default=5,
+        min=3,
+        deprecated_group="default",
+        help="""
 Maximum wait time for an external REST service to connect.
 
 Possible values:
@@ -152,10 +154,10 @@ Related options:
 * vendordata_dynamic_read_timeout
 """),
     cfg.IntOpt('vendordata_dynamic_read_timeout',
-               default=5,
-               min=0,
-               deprecated_group="default",
-               help="""
+        default=5,
+        min=0,
+        deprecated_group="default",
+        help="""
 Maximum wait time for an external REST service to return data once connected.
 
 Possible values:
@@ -171,10 +173,10 @@ Related options:
 * vendordata_dynamic_connect_timeout
 """),
     cfg.IntOpt("metadata_cache_expiration",
-            default=15,
-            min=0,
-            deprecated_group="default",
-            help="""
+        default=15,
+        min=0,
+        deprecated_group="default",
+        help="""
 This option is the time (in seconds) to cache metadata. When set to 0,
 metadata caching is disabled entirely; this is generally not recommended for
 performance reasons. Increasing this setting should improve response times
@@ -202,18 +204,18 @@ Possible values:
 
 osapi_opts = [
     cfg.IntOpt("max_limit",
-            default=1000,
-            min=0,
-            deprecated_group="default",
-            deprecated_name="osapi_max_limit",
-            help="""
+        default=1000,
+        min=0,
+        deprecated_group="default",
+        deprecated_name="osapi_max_limit",
+        help="""
 As a query can potentially return many thousands of items, you can limit the
 maximum number of items in a single response by setting this option.
 """),
     cfg.StrOpt("compute_link_prefix",
-            deprecated_group="default",
-            deprecated_name="osapi_compute_link_prefix",
-            help="""
+        deprecated_group="default",
+        deprecated_name="osapi_compute_link_prefix",
+        help="""
 This string is prepended to the normal URL that is returned in links to the
 OpenStack Compute API. If it is empty (the default), the URLs are returned
 unchanged.
@@ -223,9 +225,9 @@ Possible values:
 * Any string, including an empty string (the default).
 """),
     cfg.StrOpt("glance_link_prefix",
-            deprecated_group="default",
-            deprecated_name="osapi_glance_link_prefix",
-            help="""
+        deprecated_group="default",
+        deprecated_name="osapi_glance_link_prefix",
+        help="""
 This string is prepended to the normal URL that is returned in links to
 Glance resources. If it is empty (the default), the URLs are returned
 unchanged.
@@ -289,9 +291,9 @@ fping_path_opts = [
 
 os_network_opts = [
     cfg.BoolOpt("use_neutron_default_nets",
-            default=False,
-            deprecated_group="default",
-            help="""
+        default=False,
+        deprecated_group="default",
+        help="""
 When True, the TenantNetworkController will query the Neutron API to get the
 default networks to use.
 
@@ -300,9 +302,9 @@ Related options:
 * neutron_default_tenant_id
 """),
     cfg.StrOpt("neutron_default_tenant_id",
-            default="default",
-            deprecated_group="default",
-            help="""
+        default="default",
+        deprecated_group="default",
+        help="""
 Tenant ID for getting the default network from Neutron API (also referred in
 some places as the 'project ID') to use.