diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-10 20:02:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-10 20:02:20 +0000 |
| commit | 0eb3f134df0cbc2159bb511a62270e0b3ea4061d (patch) | |
| tree | f21c364e25b750a97e3e4f202877c139e94ac9e0 | |
| parent | f403f320e1b72d7d23c8d7391c105be32af7f91a (diff) | |
| parent | 121f5312185a5ade30889ed975cd2091dc63f288 (diff) | |
| download | heat-0eb3f134df0cbc2159bb511a62270e0b3ea4061d.tar.gz | |
Merge "Ignore TypeErrors on old properties during update" into stable/kilo
| -rw-r--r-- | heat/engine/resource.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py index eeb80359f..d5fd56644 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 |