From 555fba7dee7556d2c2c6463d5759f42b28f3cf26 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 21 Nov 2016 14:41:37 +0200 Subject: [PATCH] Use generic keystoneauth plugin identity interfaces This allows us to use versionless endpoints for keystone in the configuration files and furthermore, we won't depend on a specific keystone version, as is the case today. Change-Id: I124c0ea2d9403d6b530b33f18896c4e7bf4eabb5 Depends-On: I35f1c9dcd20017b9c442b04c142e46cad4d15eb4 --- castellan/key_manager/barbican_key_manager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/castellan/key_manager/barbican_key_manager.py b/castellan/key_manager/barbican_key_manager.py index 3e448221..07154b6e 100644 --- a/castellan/key_manager/barbican_key_manager.py +++ b/castellan/key_manager/barbican_key_manager.py @@ -131,7 +131,7 @@ class BarbicanKeyManager(key_manager.KeyManager): auth_url = self.conf.barbican.auth_endpoint if context.__class__.__name__ is 'KeystonePassword': - return identity.V3Password( + return identity.Password( auth_url=auth_url, username=context.username, password=context.password, @@ -147,7 +147,7 @@ class BarbicanKeyManager(key_manager.KeyManager): project_domain_name=context.project_domain_name, reauthenticate=context.reauthenticate) elif context.__class__.__name__ is 'KeystoneToken': - return identity.V3Token( + return identity.Token( auth_url=auth_url, token=context.token, trust_id=context.trust_id, @@ -161,7 +161,7 @@ class BarbicanKeyManager(key_manager.KeyManager): # this will be kept for oslo.context compatibility until # projects begin to use utils.credential_factory elif context.__class__.__name__ is 'RequestContext': - return identity.V3Token( + return identity.Token( auth_url=auth_url, token=context.auth_token, project_id=context.tenant)