Merge "Update Keystone core to Mitaka."

1 files changed, 24 insertions, 19 deletions

diff --git a/keystone-moon/setup.cfg b/keystone-moon/setup.cfg
index 5290d40c..2ac7436f 100644
--- a/keystone-moon/setup.cfg
+++ b/keystone-moon/setup.cfg
@@ -5,7 +5,7 @@ description-file =
     README.rst
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
-home-page = http://www.openstack.org/
+home-page = http://docs.openstack.org/developer/keystone/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -22,14 +22,14 @@ packages =
 
 [extras]
 ldap =
-  python-ldap>=2.4:python_version=='2.7'
+  python-ldap>=2.4:python_version=='2.7' # PSF
   ldappool>=1.0:python_version=='2.7' # MPL
 memcache =
-  python-memcached>=1.56
+  python-memcached>=1.56 # PSF
 mongodb =
-  pymongo>=3.0.2
+  pymongo!=3.1,>=3.0.2 # Apache-2.0
 bandit =
-  bandit>=0.13.2
+  bandit>=0.17.3 # Apache-2.0
 
 [global]
 setup-hooks =
@@ -103,11 +103,13 @@ keystone.auth.saml2 =
 keystone.auth.token =
     default = keystone.auth.plugins.token:Token
 
+keystone.auth.totp =
+    default = keystone.auth.plugins.totp:TOTP
+
 keystone.auth.x509 =
     default = keystone.auth.plugins.mapped:Mapped
 
 keystone.catalog =
-    kvs = keystone.catalog.backends.kvs:Catalog
     sql = keystone.catalog.backends.sql:Catalog
     templated = keystone.catalog.backends.templated:Catalog
     endpoint_filter.sql = keystone.contrib.endpoint_filter.backends.catalog_sql:EndpointFilterCatalog
@@ -125,19 +127,20 @@ keystone.identity.id_generator =
 keystone.identity.id_mapping =
     sql = keystone.identity.mapping_backends.sql:Mapping
 
+keystone.identity.shadow_users =
+    sql = keystone.identity.shadow_backends.sql:ShadowUsers
+
 keystone.policy =
     rules = keystone.policy.backends.rules:Policy
     sql = keystone.policy.backends.sql:Policy
 
 keystone.resource =
-    ldap = keystone.resource.backends.ldap:Resource
     sql = keystone.resource.backends.sql:Resource
 
 keystone.resource.domain_config =
     sql = keystone.resource.config_backends.sql:DomainConfig
 
 keystone.role =
-    ldap = keystone.assignment.role_backends.ldap:Role
     sql = keystone.assignment.role_backends.sql:Role
 
 keystone.token.persistence =
@@ -156,20 +159,19 @@ keystone.trust =
     sql = keystone.trust.backends.sql:Trust
 
 keystone.endpoint_filter =
-    sql = keystone.contrib.endpoint_filter.backends.sql:EndpointFilter
+    sql = keystone.catalog.backends.sql:Catalog
 
 keystone.endpoint_policy =
     sql = keystone.endpoint_policy.backends.sql:EndpointPolicy
 
 keystone.federation =
-    sql = keystone.contrib.federation.backends.sql:Federation
+    sql = keystone.federation.backends.sql:Federation
 
 keystone.oauth1 =
-    sql = keystone.contrib.oauth1.backends.sql:OAuth1
+    sql = keystone.oauth1.backends.sql:OAuth1
 
 keystone.revoke =
-    kvs = keystone.contrib.revoke.backends.kvs:Revoke
-    sql = keystone.contrib.revoke.backends.sql:Revoke
+    sql = keystone.revoke.backends.sql:Revoke
 
 keystone.moon.configuration =
     ram = keystone.contrib.moon.backends.memory:ConfigurationConnector
@@ -187,11 +189,14 @@ oslo.config.opts =
     keystone = keystone.common.config:list_opts
     keystone.notifications = keystone.notifications:list_opts
 
+oslo.config.opts.defaults =
+    keystone = keystone.common.config:set_middleware_defaults
+
 paste.filter_factory =
     admin_token_auth = keystone.middleware:AdminTokenAuthMiddleware.factory
     build_auth_context = keystone.middleware:AuthContextMiddleware.factory
     crud_extension = keystone.contrib.admin_crud:CrudExtension.factory
-    debug = keystone.common.wsgi:Debug.factory
+    debug = oslo_middleware:Debug.factory
     endpoint_filter_extension = keystone.contrib.endpoint_filter.routers:EndpointFilterExtension.factory
     ec2_extension = keystone.contrib.ec2:Ec2Extension.factory
     ec2_extension_v3 = keystone.contrib.ec2:Ec2ExtensionV3.factory
@@ -208,9 +213,9 @@ paste.filter_factory =
     user_crud_extension = keystone.contrib.user_crud:CrudExtension.factory
 
 paste.app_factory =
-    admin_service = keystone.service:admin_app_factory
-    admin_version_service = keystone.service:admin_version_app_factory
-    public_service = keystone.service:public_app_factory
-    public_version_service = keystone.service:public_version_app_factory
-    service_v3 = keystone.service:v3_app_factory
+    admin_service = keystone.version.service:admin_app_factory
+    admin_version_service = keystone.version.service:admin_version_app_factory
+    public_service = keystone.version.service:public_app_factory
+    public_version_service = keystone.version.service:public_version_app_factory
+    service_v3 = keystone.version.service:v3_app_factory
     moon_service = keystone.contrib.moon.service:moon_app_factory