aboutsummaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/server/backends.py
diff options
context:
space:
mode:
authorDUVAL Thomas <thomas.duval@orange.com>2016-06-09 09:11:50 +0200
committerDUVAL Thomas <thomas.duval@orange.com>2016-06-09 09:11:50 +0200
commit2e7b4f2027a1147ca28301e4f88adf8274b39a1f (patch)
tree8b8d94001ebe6cc34106cf813b538911a8d66d9a /keystone-moon/keystone/server/backends.py
parenta33bdcb627102a01244630a54cb4b5066b385a6a (diff)
Update Keystone core to Mitaka.
Change-Id: Ia10d6add16f4a9d25d1f42d420661c46332e69db
Diffstat (limited to 'keystone-moon/keystone/server/backends.py')
-rw-r--r--keystone-moon/keystone/server/backends.py22
1 files changed, 16 insertions, 6 deletions
diff --git a/keystone-moon/keystone/server/backends.py b/keystone-moon/keystone/server/backends.py
index ebe00a81..a518e777 100644
--- a/keystone-moon/keystone/server/backends.py
+++ b/keystone-moon/keystone/server/backends.py
@@ -14,15 +14,14 @@ from keystone import assignment
from keystone import auth
from keystone import catalog
from keystone.common import cache
-from keystone.contrib import endpoint_filter
-from keystone.contrib import federation
-from keystone.contrib import oauth1
-from keystone.contrib import revoke
from keystone import credential
from keystone import endpoint_policy
+from keystone import federation
from keystone import identity
+from keystone import oauth1
from keystone import policy
from keystone import resource
+from keystone import revoke
from keystone import token
from keystone import trust
@@ -30,12 +29,23 @@ from keystone import trust
def load_backends():
# Configure and build the cache
- cache.configure_cache_region(cache.REGION)
+ cache.configure_cache()
+ cache.configure_cache(region=catalog.COMPUTED_CATALOG_REGION)
+ cache.apply_invalidation_patch(
+ region=catalog.COMPUTED_CATALOG_REGION,
+ region_name=catalog.COMPUTED_CATALOG_REGION.name)
+ cache.configure_cache(region=assignment.COMPUTED_ASSIGNMENTS_REGION)
+ cache.apply_invalidation_patch(
+ region=assignment.COMPUTED_ASSIGNMENTS_REGION,
+ region_name=assignment.COMPUTED_ASSIGNMENTS_REGION.name)
# Ensure that the identity driver is created before the assignment manager
# and that the assignment driver is created before the resource manager.
# The default resource driver depends on assignment, which in turn
# depends on identity - hence we need to ensure the chain is available.
+ # TODO(morganfainberg): In "O" release move _IDENTITY_API to be directly
+ # instantiated in the DRIVERS dict once assignment driver being selected
+ # based upon [identity]/driver is removed.
_IDENTITY_API = identity.Manager()
_ASSIGNMENT_API = assignment.Manager()
@@ -44,12 +54,12 @@ def load_backends():
catalog_api=catalog.Manager(),
credential_api=credential.Manager(),
domain_config_api=resource.DomainConfigManager(),
- endpoint_filter_api=endpoint_filter.Manager(),
endpoint_policy_api=endpoint_policy.Manager(),
federation_api=federation.Manager(),
id_generator_api=identity.generator.Manager(),
id_mapping_api=identity.MappingManager(),
identity_api=_IDENTITY_API,
+ shadow_users_api=identity.ShadowUsersManager(),
oauth_api=oauth1.Manager(),
policy_api=policy.Manager(),
resource_api=resource.Manager(),