From f56ca96325c200749144b2922d20d84ac47c63ef Mon Sep 17 00:00:00 2001 From: rabi Date: Mon, 2 May 2022 09:06:35 +0530 Subject: Log parameters merged This can help in troubleshooting. Task: 45579 Change-Id: I6aee0719b0cdef2b17666a43074c5c18645fc180 (cherry picked from commit c0be1f01fd9c208130857efd7c01ece94d4fb0bb) (cherry picked from commit d997d70ca13065d1caf96c06af05d084353ca827) --- heat/common/environment_util.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/heat/common/environment_util.py b/heat/common/environment_util.py index 5143719d8..eb3b8cde1 100644 --- a/heat/common/environment_util.py +++ b/heat/common/environment_util.py @@ -12,6 +12,7 @@ # under the License. import collections +from oslo_log import log as logging from oslo_serialization import jsonutils from heat.common import environment_format as env_fmt @@ -21,6 +22,8 @@ from heat.common.i18n import _ ALLOWED_PARAM_MERGE_STRATEGIES = (OVERWRITE, MERGE, DEEP_MERGE) = ( 'overwrite', 'merge', 'deep_merge') +LOG = logging.getLogger(__name__) + def get_param_merge_strategy(merge_strategies, param_key, available_strategies=None): @@ -129,12 +132,15 @@ def merge_parameters(old, new, param_schemata, strategies_in_file, param=key, env_file=env_file) if param_merge_strategy == DEEP_MERGE: + LOG.debug("Deep Merging Parameter: %s", key) param_merge(key, value, param_schemata[key], deep_merge=True) elif param_merge_strategy == MERGE: + LOG.debug("Merging Parameter: %s", key) param_merge(key, value, param_schemata[key]) else: + LOG.debug("Overriding Parameter: %s", key) old[key] = value return old, new_strategies -- cgit v1.2.1