From 11bfc1e529d93cd06f15745413578a38c464f1a2 Mon Sep 17 00:00:00 2001 From: James Page Date: Sat, 13 May 2017 09:48:19 +0200 Subject: [PATCH] Use provided unit scope in db_changed If the unit parameter is passed to the db_changed function, ensure that its used instead of the remote_unit function so that db_changed can be called outside of the db-relation-changed hook context. Change-Id: I30b42522ed982213176e485a1140ed872fc571df Closes-Bug: 1688401 --- hooks/percona_hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/percona_hooks.py b/hooks/percona_hooks.py index f3a6bcf..0186233 100755 --- a/hooks/percona_hooks.py +++ b/hooks/percona_hooks.py @@ -396,7 +396,7 @@ def db_changed(relation_id=None, unit=None, admin=None): if admin not in [True, False]: admin = relation_type() == 'db-admin' - db_name, _ = remote_unit().split("/") + db_name, _ = (unit or remote_unit()).split("/") username = db_name db_helper = get_db_helper() addr = relation_get('private-address', unit=unit, rid=relation_id)