openstack
/
charm-interface-keystone-admin
Code Issues Proposed changes

[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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
requires.py
View File

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