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

credentials() also returns "region" parameter

This commit is contained in:
Alvaro Uría 2016-03-09 15:31:39 +01:00
parent 557b0e5cd2
commit 19f108508b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
requires.py
View File

@ -43,6 +43,15 @@ class KeystoneRequires(RelationBase):
def credentials(self): def credentials(self):
""" """
Returns a dict of keystone admin credentials 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() convs = self.conversations()
if len(convs) > 0: if len(convs) > 0:
@ -52,7 +61,8 @@ class KeystoneRequires(RelationBase):
'service_port': conv.get_remote('service_port'), 'service_port': conv.get_remote('service_port'),
'service_username': conv.get_remote('service_username'), 'service_username': conv.get_remote('service_username'),
'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'),
'service_region': conv.get_remote('service_region')
} }
else: else:
return {} return {}