def authenticate(self, auth):
# establish nova connection
- self.api.client_shell = NovaShell(username=auth['Username'],
+ keystone_name = auth['Username'][:auth['Username'].index('@')]
+ self.api.client_shell = NovaShell(username=keystone_name,
password=auth['AuthString'],
tenant=auth['Tenant'])
self.api.client_shell.authenticate()
if config:
config = Config(config)
else:
- config = Config()
+ config = Config()
self.username = config.nova_admin_user
self.password = config.nova_admin_password
self.tenant = config.nova_admin_tenant
if tenant:
self.tenant = tenant
if url:
- self.url = url
+ self.url = url
+
+ if '@' in self.username:
+ self.username = self.username[:self.username.index('@')]
class KeystoneClient(Client):
def __init__(self, *args, **kwds):