openstack
/
heat
Code Issues Proposed changes

Log parameters merged 

This can help in troubleshooting.

Task: 45579
Change-Id: I6aee0719b0cdef2b17666a43074c5c18645fc180
(cherry picked from commit c0be1f01fd)
This commit is contained in:
rabi 2022-05-02 09:06:35 +05:30 committed by Takashi Kajinami
parent f050798058
commit d997d70ca1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/common/environment_util.py
View File

@ -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