X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=modules%2Flibjuju%2Fjuju%2Fcontroller.py;fp=modules%2Flibjuju%2Fjuju%2Fcontroller.py;h=ed9b744d3b5036e1c4f4cfbd48efdff17d451402;hp=d3902ba1135f41f2520171b27e22b3e149db9927;hb=93a3db12e79d8e35ab8ca9a518a56631d8fd0707;hpb=9b1fde45c38da39b576c8cf1dbdfa8f4c3408844

diff --git a/modules/libjuju/juju/controller.py b/modules/libjuju/juju/controller.py
index d3902ba..ed9b744 100644
--- a/modules/libjuju/juju/controller.py
+++ b/modules/libjuju/juju/controller.py
@@ -1,3 +1,16 @@
+# Copyright 2019 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.
 import asyncio
 import json
 import logging
@@ -292,6 +305,13 @@ class Controller:
             owner,
             region
         )
+
+        # This is a temporary workaround for a race condition:
+        # https://bugs.launchpad.net/juju/+bug/1838774
+        # This will be fixed when Juju 2.6.7 is released.
+        import time
+        time.sleep(5)
+
         from juju.model import Model
         model = Model(jujudata=self._connector.jujudata)
         kwargs = self.connection().connect_params()