diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2013-03-20 20:21:45 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2013-03-20 23:42:16 -0500 |
| commit | 601d993fb1ca16d2fedf721de5fdb70a6b55a0a8 (patch) | |
| tree | 599c5d7c878968701eee6005cbb48534c5336e89 /keystone/service.py | |
| parent | aa58233bd8ba174e07076444b0dc5fdb67f5a5e6 (diff) | |
| download | keystone-601d993fb1ca16d2fedf721de5fdb70a6b55a0a8.tar.gz keystone-601d993fb1ca16d2fedf721de5fdb70a6b55a0a8.tar.xz keystone-601d993fb1ca16d2fedf721de5fdb70a6b55a0a8.zip | |
Allow trusts to be optional
Change-Id: I76ab6ddac70cccece46bc36d7592d840599c893b
Diffstat (limited to 'keystone/service.py')
| -rw-r--r-- | keystone/service.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/keystone/service.py b/keystone/service.py index 6c7587b2..1a919d6f 100644 --- a/keystone/service.py +++ b/keystone/service.py @@ -18,6 +18,7 @@ import routes from keystone import auth from keystone import catalog +from keystone import config from keystone.common import logging from keystone.common import wsgi from keystone.contrib import ec2 @@ -28,6 +29,7 @@ from keystone import token from keystone import trust +CONF = config.CONF LOG = logging.getLogger(__name__) DRIVERS = dict( @@ -83,8 +85,12 @@ def v3_app_factory(global_conf, **local_conf): conf.update(local_conf) mapper = routes.Mapper() v3routers = [] - for module in [auth, catalog, identity, policy, trust]: + for module in [auth, catalog, identity, policy]: module.routers.append_v3_routers(mapper, v3routers) + + if CONF.trust.enabled: + trust.routers.append_v3_routers(mapper, v3routers) + # Add in the v3 version api v3routers.append(routers.VersionV3('admin')) v3routers.append(routers.VersionV3('public')) |