From 557b0e5cd242c922a735cd0a87d417c9b1c03677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alvaro=20Ur=C3=ADa?= Date: Wed, 9 Mar 2016 11:25:34 +0100 Subject: [PATCH] [fix] credentials() handles all conversations --- requires.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/requires.py b/requires.py index ef22fdb..7828b3d 100644 --- a/requires.py +++ b/requires.py @@ -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()