From 2fb294f6804cb7105dd985bf53fda55ac8817dae Mon Sep 17 00:00:00 2001 From: Devin Carlen Date: Thu, 29 Dec 2011 20:13:20 -0800 Subject: All tests but create_tenant pass --- keystonelight/keystone_compat.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit