summaryrefslogtreecommitdiff
diff options
authorPete Vander Giessen <petevg@gmail.com>2017-04-26 11:29:36 -0400
committerPete Vander Giessen <petevg@gmail.com>2017-04-26 11:29:36 -0400
commit47e8f8f8a0f2016ea6c1d10c17b3dbeb82e41c1a (patch)
tree4cbd65f643491b98912eea74248a433012628416
parente969ec7ac3c66c37803eff8e3890ae2daee4fb9e (diff)
Made timeouts even more generous in add_model.
JaaS can take a little while to respond, but the models do get added.
-rw-r--r--matrix/rules.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/matrix/rules.py b/matrix/rules.py
index 99c1b17..10bd7e0 100644
--- a/matrix/rules.py
+++ b/matrix/rules.py
@@ -456,7 +456,7 @@ class RuleEngine:
log.info("Connecting to model %s", self.model)
context.juju_model = juju.model.Model(loop=self.loop)
await asyncio.wait_for(
- context.juju_model.connect_model(self.model), 120)
+ context.juju_model.connect_model(self.model), 600)
else:
# work-around for: https://bugs.launchpad.net/juju/+bug/1652171
credential = await self._get_credential(context)
@@ -469,7 +469,7 @@ class RuleEngine:
context.juju_controller.add_model(
name, credential_name=credential,
cloud_name=context.config.cloud,
- ), 120)
+ ), 600)
self.bus.dispatch(
origin="matrix",
payload=context.juju_model,