summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-05 09:27:46 +0000
committerGerrit Code Review <review@openstack.org>2018-08-05 09:27:46 +0000
commit950795a65fa194163a0e34810fffc59096c0ac8d (patch)
tree1a0080c78dfa0488bb28ac992d46bff4a764a587
parent68dd40db86c8797b66034c070f127341da069134 (diff)
parent26f8a70a1ebb8c4bb5be6d0255ae11c721bc19d2 (diff)
downloadheat-950795a65fa194163a0e34810fffc59096c0ac8d.tar.gz
Merge "Ignore RESOLVE translation errors when deleting resources"
-rw-r--r--heat/engine/resource.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index d0dd29fd2..22c78daff 100644
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -1995,7 +1995,8 @@ class Resource(status.ResourceStatus):
# so use the stored frozen_definition instead
self.properties = self.frozen_definition().properties(
self.properties_schema, self.context)
- self.translate_properties(self.properties)
+ self.translate_properties(self.properties,
+ ignore_resolve_error=True)
with self._action_recorder(action):
if self.abandon_in_progress: