From f6ebeef9ae56f18a4e41d51da946a4dffcd8ccd9 Mon Sep 17 00:00:00 2001 From: David Ames Date: Mon, 1 Mar 2021 10:17:06 -0800 Subject: [PATCH] Set private-address on db-router relation Avoid LP Bug#1917346 when setting MySQL authentication and the expected IP address for connectivity. Change-Id: Id7f05dc80ef665d2672f512d191d8fffc0014ec7 Partial-Bug: #1917346 --- requires.py | 1 + unit_tests/test_requires.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/requires.py b/requires.py index 586d27e..f499ef4 100644 --- a/requires.py +++ b/requires.py @@ -56,6 +56,7 @@ class MySQLRouterRequires(reactive.RelationBase): relation_info = { prefix + '_username': username, prefix + '_hostname': hostname, + 'private-address': hostname, } self.set_prefix(prefix) self.set_remote(**relation_info) diff --git a/unit_tests/test_requires.py b/unit_tests/test_requires.py index c77c2ae..a28f952 100644 --- a/unit_tests/test_requires.py +++ b/unit_tests/test_requires.py @@ -232,7 +232,8 @@ class TestMySQLRouterRequires(unittest.TestCase): _prefix = "prefix" _expected = { "{}_username".format(_prefix): _user, - "{}_hostname".format(_prefix): _host} + "{}_hostname".format(_prefix): _host, + "private-address": _host} self.mysql_router.configure_db_router(_user, _host, prefix=_prefix) self.set_remote.assert_called_once_with(**_expected) self.set_local.assert_called_once_with(**_expected)