From 72d4da070d02bc333ea2bdcd427837649274f7ff Mon Sep 17 00:00:00 2001 From: Carl Csaposs Date: Fri, 11 Aug 2023 15:52:29 +0000 Subject: [PATCH] Remove bootstrapping after TLS enabled/disabled Ported from https://github.com/canonical/mysql-router-k8s-operator/pull/117 Leftover from #44 --- src/workload.py | 1 - tox.ini | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/workload.py b/src/workload.py index 73632992..bfddf9db 100644 --- a/src/workload.py +++ b/src/workload.py @@ -217,7 +217,6 @@ def _restart(self, *, tls: bool) -> None: """Restart MySQL Router to enable or disable TLS.""" logger.debug("Restarting MySQL Router") assert self._container.mysql_router_service_enabled is True - self._bootstrap_router(tls=tls) self._container.update_mysql_router_service(enabled=True, tls=tls) logger.debug("Restarted MySQL Router") self._charm.wait_until_mysql_router_ready() diff --git a/tox.ini b/tox.ini index f358ef23..e9f4e5bb 100644 --- a/tox.ini +++ b/tox.ini @@ -61,6 +61,8 @@ deps = pytest-xdist ; `pytest-cov` used instead of `coverage` for `pytest-xdist` support pytest-cov + # Workaround for https://github.com/canonical/ops-scenario/issues/48 + ops<2.5 ops-scenario -r {tox_root}/requirements.txt commands =