summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-11-09 18:26:10 +0000
committerGerrit Code Review <review@openstack.org>2022-11-09 18:26:10 +0000
commit9d9ec2994438c7d96b418d4664104a21ca94b2c8 (patch)
tree97041a3e824525eab3f4da7c3ecbb7d3df832238
parent0aa0b382519efcf128f57e884f0e83fec80f847e (diff)
parent56d99bf6589832e24e4b0ca53dd7eb2bb8dccd60 (diff)
downloadheat-9d9ec2994438c7d96b418d4664104a21ca94b2c8.tar.gz
Merge "Improve map_merge logging"
-rw-r--r--heat/engine/hot/functions.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/heat/engine/hot/functions.py b/heat/engine/hot/functions.py
index a309392b3..ec4bb9d6d 100644
--- a/heat/engine/hot/functions.py
+++ b/heat/engine/hot/functions.py
@@ -738,7 +738,9 @@ class MapMerge(function.Function):
elif isinstance(m, collections.abc.Mapping):
return m
else:
- msg = _('Incorrect arguments: Items to merge must be maps.')
+ msg = _('Incorrect arguments: Items to merge must be maps. '
+ '{} is type {} instead of a dict'.format(
+ repr(m)[:200], type(m)))
raise TypeError(msg)
ret_map = {}