diff options
| author | Devin Carlen <devin.carlen@gmail.com> | 2011-12-29 20:13:20 -0800 |
|---|---|---|
| committer | termie <github@anarkystic.com> | 2012-01-03 11:38:28 -0800 |
| commit | 2fb294f6804cb7105dd985bf53fda55ac8817dae (patch) | |
| tree | f3dd9c56e5517148521f171cbb4cec86d64a5387 | |
| parent | f2a9c51af0d4c5f38663ac425b551e47d1c8f3dd (diff) | |
| download | keystone-2fb294f6804cb7105dd985bf53fda55ac8817dae.tar.gz keystone-2fb294f6804cb7105dd985bf53fda55ac8817dae.tar.xz keystone-2fb294f6804cb7105dd985bf53fda55ac8817dae.zip | |
All tests but create_tenant pass
| -rw-r--r-- | keystonelight/keystone_compat.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/keystonelight/keystone_compat.py b/keystonelight/keystone_compat.py index 5a617414..a24c1752 100644 --- a/keystonelight/keystone_compat.py +++ b/keystonelight/keystone_compat.py @@ -99,6 +99,10 @@ class KeystoneServiceRouter(wsgi.Router): action='authenticate_ec2', conditions=dict(methods=['POST'])) +<<<<<<< HEAD +======= + # Tenant Operations +>>>>>>> All tests but create_tenant pass tenant_controller = KeystoneTenantController(self.options) mapper.connect('/tenants', controller=tenant_controller, @@ -349,7 +353,7 @@ class KeystoneTenantController(service.BaseApplication): self.policy_api = policy.Manager(options) self.token_api = token.Manager(options) - def get_tenants_for_token(self, context): + def get_tenants_for_token(self, context, **kw): """Get valid tenants for token based on token used to authenticate. Pulls the token from the context, validates it and gets the valid |