projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "CLI for OSM"
[osm/SO.git]
/
common
/
python
/
rift
/
mano
/
utils
/
juju_api.py
diff --git
a/common/python/rift/mano/utils/juju_api.py
b/common/python/rift/mano/utils/juju_api.py
index
6eb3568
..
7ba5304
100644
(file)
--- a/
common/python/rift/mano/utils/juju_api.py
+++ b/
common/python/rift/mano/utils/juju_api.py
@@
-259,7
+259,7
@@
class JujuApi(object):
mep = '{}/model/{}/api'.format(self.endpoint,
m['model']['uuid'])
model = Env2(mep, env_uuid=m['model']['uuid'])
mep = '{}/model/{}/api'.format(self.endpoint,
m['model']['uuid'])
model = Env2(mep, env_uuid=m['model']['uuid'])
- l = model.login(self.
password
, user=self.user)
+ l = model.login(self.
secret
, user=self.user)
break
if model is None:
break
if model is None:
@@
-693,9
+693,7
@@
class JujuApi(object):
except Exception as e:
msg = "{}: Resolve on unit {}: {}". \
format(self, unit, e)
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):
@asyncio.coroutine
def resolve_error(self, service=None, status=None, env=None):