Merge "Follow-up for the API config option patch"

This commit is contained in:
Jenkins
2016-05-14 02:47:01 +00:00
committed by Gerrit Code Review
2 changed files with 11 additions and 3 deletions

View File

@@ -19,7 +19,11 @@ from oslo_config import cfg
auth_opts = [
cfg.BoolOpt("api_rate_limit",
default=False,
deprecated_for_removal=True,
deprecated_group="DEFAULT",
help="""
*DEPRECATED*
Determines whether rate limiting for the API is per-user. This option is only
used by v2 API. Rate limiting is removed from v2.1 API.
@@ -345,7 +349,7 @@ to use.
Possible values:
Either "True" or "False" (default)
True, False (default)
* Related options:

View File

@@ -25,7 +25,9 @@ api_opts = [
*DEPRECATED*
This option is a list of all of the v2.1 API extensions to never load. However,
it will be removed in the near future, after which point all the API will run.
it will be removed in the near future, after which the all the functionality
that was previously in extensions will be part of the standard API, and thus
always accessible.
* Possible values:
@@ -50,7 +52,9 @@ it will be removed in the near future, after which point all the API will run.
This is a list of extensions. If it is empty, then *all* extensions except
those specified in the extensions_blacklist option will be loaded. If it is not
empty, then only those extensions in this list will be loaded, provided that
they are also not in the extensions_blacklist option.
they are also not in the extensions_blacklist option. Once this deprecated
option is removed, after which the all the functionality that was previously in
extensions will be part of the standard API, and thus always accessible.
* Possible values: