Merge "Ensure relation id is passed to remote_service_name"

This commit is contained in:
Zuul 2019-03-13 11:57:08 +00:00 committed by Gerrit Code Review
commit 6c5fbb59b4

View File

@ -759,7 +759,7 @@ def client_relation(relid=None, unit=None):
if ready_for_service(): if ready_for_service():
log('mon cluster in quorum and osds bootstrapped ' log('mon cluster in quorum and osds bootstrapped '
'- providing client with keys, processing broker requests') '- providing client with keys, processing broker requests')
service_name = hookenv.remote_service_name() service_name = hookenv.remote_service_name(relid=relid)
public_addr = get_public_addr() public_addr = get_public_addr()
data = {'key': ceph.get_named_key(service_name), data = {'key': ceph.get_named_key(service_name),
'auth': config('auth-supported'), 'auth': config('auth-supported'),