Merge "remove deprecated [endpoint_policy] enable option"

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,
 ]
 

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)