projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BUG 402 : Raising Exception if the charm directory is not found
[osm/SO.git]
/
rwcm
/
plugins
/
rwconman
/
rift
/
tasklets
/
rwconmantasklet
/
jujuconf.py
diff --git
a/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
b/rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
index
7688dae
..
b003df8
100644
(file)
--- a/
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
+++ b/
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/jujuconf.py
@@
-190,8
+190,11
@@
class JujuConfigPlugin(riftcm_config_plugin.RiftCMConfigPluginBase):
charm)
self._log.debug("jujuCA: Charm dir is {}".format(path))
if not os.path.isdir(path):
charm)
self._log.debug("jujuCA: Charm dir is {}".format(path))
if not os.path.isdir(path):
- self._log.error("jujuCA: Did not find the charm directory at {}".format(path))
+ msg = "jujuCA: Did not find the charm directory at {}".format(path)
+ self._log.error(msg)
path = None
path = None
+ # Return from here instead of forwarding the config request to juju_api
+ raise Exception(msg)
except Exception as e:
self.log.exception(e)
return False
except Exception as e:
self.log.exception(e)
return False