Prefer the cluster relation for bootstrap address rather than juju-in…

…fo (#116) * Prefer the cluster relation for bootstrap address rather than juju-info * Address test failures
canonical · May 17, 2024 · 679f72f · 679f72f
1 parent f6cae8c
commit 679f72f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/charms/worker/k8s/src/charm.py b/charms/worker/k8s/src/charm.py
@@ -286,7 +286,7 @@ def _bootstrap_k8s_snap(self):
 
         status.add(ops.MaintenanceStatus("Bootstrapping Cluster"))
 
-        binding = self.model.get_binding("juju-info")
+        binding = self.model.get_binding("cluster")
         address = binding and binding.network.ingress_address
         node_name = self.get_node_name()
         payload = CreateClusterRequest(

diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -243,7 +243,10 @@ async def deploy_model(
                 status="active",
                 timeout=30 * 60,
             )
-        yield the_model
+        try:
+            yield the_model
+        except GeneratorExit:
+            log.fatal("Failed to determine model: model_name=%s", model_name)
 
 
 @pytest_asyncio.fixture(scope="module")