From 19f108508b32df8cb549b3a672ed60400157df95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alvaro=20Ur=C3=ADa?= Date: Wed, 9 Mar 2016 15:31:39 +0100 Subject: [PATCH] credentials() also returns "region" parameter --- requires.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/requires.py b/requires.py index 7828b3d..a7e5228 100644 --- a/requires.py +++ b/requires.py @@ -43,6 +43,15 @@ class KeystoneRequires(RelationBase): def credentials(self): """ Returns a dict of keystone admin credentials + + keystone provides: + {u'service_password': u'XXXXXXXX', + u'service_port': u'5000', + u'private-address': u'10.XX.XX.XXX', + u'service_hostname': u'10.XX.XX.XXX', + u'service_username': u'admin', + u'service_tenant_name': u'Admin', + u'service_region': u'RegionOne'} """ convs = self.conversations() if len(convs) > 0: @@ -52,7 +61,8 @@ class KeystoneRequires(RelationBase): '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') + 'service_tenant_name': conv.get_remote('service_tenant_name'), + 'service_region': conv.get_remote('service_region') } else: return {}