From 121f5312185a5ade30889ed975cd2091dc63f288 Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Tue, 1 Mar 2016 17:56:33 -0500 Subject: [PATCH] Ignore TypeErrors on old properties during update Extend the approach from 1cfde62b2ff8a60c8cc3a9ef4926e5f4a7116aee of ignoring ValueErrors in the _previous_ properties when doing an update to also ignoring TypeErrors. Change-Id: Ic08165fe031e1764cfb34eaf782d3e105f04fee3 Closes-Bug: #1538551 Related-Bug: #1543685 (cherry picked from commit 79c410d92326e63c8bf3752922c35abf6264e211) --- heat/engine/resource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heat/engine/resource.py b/heat/engine/resource.py index eeb80359f8..d5fd566441 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -417,7 +417,7 @@ class Resource(object): def prop_changed(key): try: before = before_props.get(key) - except ValueError as exc: + except (TypeError, ValueError) as exc: # We shouldn't get here usually, but there is a known issue # with template resources and new parameters in non-convergence # stacks (see bug 1543685). The error should be harmless