From 7c8acbc18fae896bd5340ddea8eaa2a070620ba6 Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 4 Feb 2021 13:03:28 -0800 Subject: [PATCH] Use report host on bootstrap LP Bug #1914649 saw an edge case where --report-host was necessary for mysql-router bootstrap. Adding it to cover this edge case. Change-Id: I0ea751aa4015ad6e569d9c3e9f8364cf36801c18 Closes-Bug: #1914649 --- src/lib/charm/openstack/mysql_router.py | 1 + unit_tests/test_lib_charm_openstack_mysql_router.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/lib/charm/openstack/mysql_router.py b/src/lib/charm/openstack/mysql_router.py index 4a665b6..66f6e48 100644 --- a/src/lib/charm/openstack/mysql_router.py +++ b/src/lib/charm/openstack/mysql_router.py @@ -388,6 +388,7 @@ class MySQLRouterCharm(charms_openstack.charm.OpenStackCharm): "--directory", self.mysqlrouter_working_dir, "--conf-use-sockets", "--conf-bind-address", self.shared_db_address, + "--report-host", self.db_router_address, "--conf-base-port", str(self.mysqlrouter_port)] # Avoid multiple routers trying to bind to the same api port # Bug #1911907 diff --git a/unit_tests/test_lib_charm_openstack_mysql_router.py b/unit_tests/test_lib_charm_openstack_mysql_router.py index ed6aedd..7d0b61d 100644 --- a/unit_tests/test_lib_charm_openstack_mysql_router.py +++ b/unit_tests/test_lib_charm_openstack_mysql_router.py @@ -392,6 +392,7 @@ class TestMySQLRouterCharm(test_utils.PatchHelper): "--directory", mrc.mysqlrouter_working_dir, "--conf-use-sockets", "--conf-bind-address", mrc.shared_db_address, + "--report-host", mrc.db_router_address, "--conf-base-port", _port], stderr=self.stdout) self.set_flag.assert_called_once_with( @@ -408,6 +409,7 @@ class TestMySQLRouterCharm(test_utils.PatchHelper): "--directory", mrc.mysqlrouter_working_dir, "--conf-use-sockets", "--conf-bind-address", mrc.shared_db_address, + "--report-host", mrc.db_router_address, "--conf-base-port", _port, "--disable-rest"], stderr=self.stdout)