Remove deprecated admin_endpoint

This patch removes the admin_endpoint that
was deprecated in rocky release.

Partial-Bug: #1829453
Change-Id: Ieb81eed18005bd5057b964bd92b67150262b1d20
This commit is contained in:
Vishakha Agarwal 2019-06-10 16:24:16 +05:30
parent 4bbee7b417
commit 192cde56e5
2 changed files with 4 additions and 20 deletions

View File

@ -11,7 +11,6 @@
# under the License.
from oslo_config import cfg
from oslo_log import versionutils
from keystone.conf import utils
@ -40,24 +39,6 @@ the value of the base URL contains a path that keystone does not automatically
infer (`/prefix/v3`), or if the endpoint should be found on a different host.
"""))
admin_endpoint = cfg.URIOpt(
'admin_endpoint',
deprecated_since=versionutils.deprecated.ROCKY,
deprecated_for_removal=True,
deprecated_reason=utils.fmt("""
With the removal of the 2.0 API keystone does not distinguish between admin
and public endpoints.
"""),
help=utils.fmt("""
The base admin endpoint URL for Keystone that is advertised to clients (NOTE:
this does NOT affect how Keystone listens for connections). Defaults to the
base host URL of the request. For example, if keystone receives a request to
`http://server:35357/v3/users`, then this will option will be automatically
treated as `http://server:35357`. You should only need to set option if either
the value of the base URL contains a path that keystone does not automatically
infer (`/prefix/v3`), or if the endpoint should be found on a different host.
"""))
max_project_tree_depth = cfg.IntOpt(
'max_project_tree_depth',
default=5,
@ -160,7 +141,6 @@ GROUP_NAME = 'DEFAULT'
ALL_OPTS = [
admin_token,
public_endpoint,
admin_endpoint,
max_project_tree_depth,
max_param_size,
max_token_size,

View File

@ -3,3 +3,7 @@ other:
- |
[`bug 1829453 <https://bugs.launchpad.net/keystone/+bug/1829453>`_]
The deprecated config option `infer_roles` is removed now.
- >
[`bug 1829453 <https://bugs.launchpad.net/keystone/+bug/1829453>`_]
The deprecated config option `admin_endpoint` is removed now.