[fix] credentials() handles all conversations

This commit is contained in:
Alvaro Uría 2016-03-09 11:25:34 +01:00
parent c37a179369
commit 557b0e5cd2
1 changed files with 12 additions and 8 deletions

View File

@ -44,14 +44,18 @@ class KeystoneRequires(RelationBase):
"""
Returns a dict of keystone admin credentials
"""
conv = self.conversation()
return {
'service_hostname': conv.get_remote('service_hostname'),
'service_port': conv.get_remote('service_port'),
'service_username': conv.get_remote('service_username'),
'service_password': conv.get_remote('service_password'),
'service_tenant_name': conv.get_remote('service_tenant_name')
}
convs = self.conversations()
if len(convs) > 0:
conv = convs[0]
return {
'service_hostname': conv.get_remote('service_hostname'),
'service_port': conv.get_remote('service_port'),
'service_username': conv.get_remote('service_username'),
'service_password': conv.get_remote('service_password'),
'service_tenant_name': conv.get_remote('service_tenant_name')
}
else:
return {}
def auth_data_complete(self):
data = self.credentials()