From ba964486aabcda7892189ab87d3c05a9ce8e6cd5 Mon Sep 17 00:00:00 2001
From: Steve Martinelli <s.martinelli@gmail.com>
Date: Wed, 21 Sep 2016 22:39:25 -0400
Subject: [PATCH] remove deprecated `[endpoint_policy] enable` option

the endpoint policy routes and controller are should always be
available.

bp removed-as-of-ocata

Change-Id: I59c3728e984c267f21c1f11b87a77d659c8c8cfb
---
 keystone/conf/endpoint_policy.py | 17 -----------------
 keystone/version/service.py      |  4 +---
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/keystone/conf/endpoint_policy.py b/keystone/conf/endpoint_policy.py
index 0b97baf8a..efbb3b4e5 100644
--- a/keystone/conf/endpoint_policy.py
+++ b/keystone/conf/endpoint_policy.py
@@ -11,26 +11,10 @@
 # under the License.
 
 from oslo_config import cfg
-from oslo_log import versionutils
 
 from keystone.conf import utils
 
 
-enabled = cfg.BoolOpt(
-    'enabled',
-    default=True,
-    deprecated_for_removal=True,
-    deprecated_reason=utils.fmt("""
-The option to enable the OS-ENDPOINT-POLICY API extension has been deprecated
-in the M release and will be removed in the O release. The OS-ENDPOINT-POLICY
-API extension will be enabled by default.
-"""),
-    deprecated_since=versionutils.deprecated.MITAKA,
-    help=utils.fmt("""
-Enable endpoint-policy functionality, which allows policies to be associated
-with either specific endpoints, or endpoints of a given service type.
-"""))
-
 driver = cfg.StrOpt(
     'driver',
     default='sql',
@@ -43,7 +27,6 @@ to set this unless you are providing a custom entry point.
 
 GROUP_NAME = __name__.split('.')[-1]
 ALL_OPTS = [
-    enabled,
     driver,
 ]
 
diff --git a/keystone/version/service.py b/keystone/version/service.py
index f63e02c2d..e7c2dead0 100644
--- a/keystone/version/service.py
+++ b/keystone/version/service.py
@@ -141,6 +141,7 @@ def v3_app_factory(global_conf, **local_conf):
                        revoke_routers,
                        federation_routers,
                        oauth1_routers,
+                       endpoint_policy_routers,
                        # TODO(morganfainberg): Remove the simple_cert router
                        # when PKI and PKIZ tokens are removed.
                        simple_cert_ext]
@@ -148,9 +149,6 @@ def v3_app_factory(global_conf, **local_conf):
     if CONF.trust.enabled:
         all_api_routers.append(trust_routers)
 
-    if CONF.endpoint_policy.enabled:
-        all_api_routers.append(endpoint_policy_routers)
-
     for api_routers in all_api_routers:
         routers_instance = api_routers.Routers()
         _routers.append(routers_instance)