openstack
/
charm-interface-keystone
Code Issues Proposed changes

Fix name of *_tenant_id var passed back from keystone

This commit is contained in:
Liam Young 2015-12-07 11:47:24 +00:00
parent fab262721a
commit 13c6c40998
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
requires.py
View File

@ -23,8 +23,8 @@ class KeystoneRequires(RelationBase):
# with a basic documentation string provided.
auto_accessors = ['private-address', 'service_host', 'service_protocol',
'service_port', 'service_tenant', 'service_username',
'service_password', 'auth_host', 'auth_protocol',
'auth_port', 'admin_tenant_id']
'service_password', 'service_tenant_id', 'auth_host',
'auth_protocol', 'auth_port']
@hook('{requires:keystone}-relation-joined')
def joined(self):
@ -54,14 +54,16 @@ class KeystoneRequires(RelationBase):
return False
return True
def register_endpoints(self, public_url, internal_url, admin_url):
def register_endpoints(self, service, region, public_url, internal_url, admin_url):
"""
Register this service with keystone
"""
relation_info = {
'service': service,
'public_url': public_url,
'internal_url': internal_url,
'admin_url': admin_url,
'region': region,
}
self.set_local(**relation_info)
self.set_remote(**relation_info)