Merge "heat engine : error on resource update with invalid properties"

This commit is contained in:
Jenkins 2013-01-30 12:34:11 +00:00 committed by Gerrit Code Review
commit 2533e8ad6d

View File

@ -255,7 +255,7 @@ class Resource(object):
self.t = self.stack.resolve_static_data(json_snippet) self.t = self.stack.resolve_static_data(json_snippet)
err = self.properties.validate() err = self.properties.validate()
if err: if err:
return err raise ValueError(err)
if callable(getattr(self, 'handle_update', None)): if callable(getattr(self, 'handle_update', None)):
result = self.handle_update() result = self.handle_update()
except Exception as ex: except Exception as ex: