From 192cde56e57a06750641b319da8a72cdcaa554d0 Mon Sep 17 00:00:00 2001
From: Vishakha Agarwal <agarwalvishakha18@gmail.com>
Date: Mon, 10 Jun 2019 16:24:16 +0530
Subject: [PATCH] Remove deprecated admin_endpoint

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

Partial-Bug: #1829453
Change-Id: Ieb81eed18005bd5057b964bd92b67150262b1d20
---
 keystone/conf/default.py                      | 20 -------------------
 .../removed-as-of-train-92b2942a680eb859.yaml |  4 ++++
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/keystone/conf/default.py b/keystone/conf/default.py
index 6730bffa45..25d8731ab6 100644
--- a/keystone/conf/default.py
+++ b/keystone/conf/default.py
@@ -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,
diff --git a/releasenotes/notes/removed-as-of-train-92b2942a680eb859.yaml b/releasenotes/notes/removed-as-of-train-92b2942a680eb859.yaml
index 2db0cc9a70..3124c9a01d 100644
--- a/releasenotes/notes/removed-as-of-train-92b2942a680eb859.yaml
+++ b/releasenotes/notes/removed-as-of-train-92b2942a680eb859.yaml
@@ -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.