X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=common%2Fpython%2Frift%2Fmano%2Futils%2Fjuju_api.py;h=b452b8a5e01090a992506d287fef39b135e687e1;hb=45daac01d4a59f6bad4d36e2b5fe11788a7109a9;hp=3f3b0864aa6458e463829e15bd310c470492e0da;hpb=6f07e6f33f751ab4ffe624f6037f887b243bece2;p=osm%2FSO.git

diff --git a/common/python/rift/mano/utils/juju_api.py b/common/python/rift/mano/utils/juju_api.py
index 3f3b0864..b452b8a5 100644
--- a/common/python/rift/mano/utils/juju_api.py
+++ b/common/python/rift/mano/utils/juju_api.py
@@ -256,9 +256,10 @@ class JujuApi(object):
             models = env.models.list()
             for m in models['user-models']:
                 if m['model']['name'] == 'default':
-                    mep =  '{}/model/{}/api'.format(endpoint, m['model']['uuid'])
+                    mep =  '{}/model/{}/api'.format(self.endpoint,
+                                                    m['model']['uuid'])
                     model = Env2(mep, env_uuid=m['model']['uuid'])
-                    l = model.login(args.password, user=args.user)
+                    l = model.login(self.secret, user=self.user)
                     break
 
             if model is None:
@@ -359,8 +360,8 @@ class JujuApi(object):
 
         # Optimizing calls to Juju, as currently we deploy only 1 unit per
         # service.
-        if self.service == service and len(self.units):
-            return self.units
+        # if self.service == service and len(self.units):
+        #     return self.units
 
         if env is None:
             env = self._get_env()
@@ -692,9 +693,7 @@ class JujuApi(object):
                     except Exception as e:
                         msg = "{}: Resolve on unit {}: {}". \
                               format(self, unit, e)
-                        self.log.error(msg)
-                        self.log.exception(e)
-                        raise JujuResolveError(msg)
+                        self.log.warn(msg)
 
     @asyncio.coroutine
     def resolve_error(self, service=None, status=None, env=None):