Log parameters merged
This can help in troubleshooting.
Task: 45579
Change-Id: I6aee0719b0cdef2b17666a43074c5c18645fc180
(cherry picked from commit c0be1f01fd
)
This commit is contained in:
parent
f050798058
commit
d997d70ca1
|
@ -12,6 +12,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
import collections
|
import collections
|
||||||
|
|
||||||
|
from oslo_log import log as logging
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from heat.common import environment_format as env_fmt
|
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) = (
|
ALLOWED_PARAM_MERGE_STRATEGIES = (OVERWRITE, MERGE, DEEP_MERGE) = (
|
||||||
'overwrite', 'merge', 'deep_merge')
|
'overwrite', 'merge', 'deep_merge')
|
||||||
|
|
||||||
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def get_param_merge_strategy(merge_strategies, param_key,
|
def get_param_merge_strategy(merge_strategies, param_key,
|
||||||
available_strategies=None):
|
available_strategies=None):
|
||||||
|
@ -129,12 +132,15 @@ def merge_parameters(old, new, param_schemata, strategies_in_file,
|
||||||
param=key, env_file=env_file)
|
param=key, env_file=env_file)
|
||||||
|
|
||||||
if param_merge_strategy == DEEP_MERGE:
|
if param_merge_strategy == DEEP_MERGE:
|
||||||
|
LOG.debug("Deep Merging Parameter: %s", key)
|
||||||
param_merge(key, value,
|
param_merge(key, value,
|
||||||
param_schemata[key],
|
param_schemata[key],
|
||||||
deep_merge=True)
|
deep_merge=True)
|
||||||
elif param_merge_strategy == MERGE:
|
elif param_merge_strategy == MERGE:
|
||||||
|
LOG.debug("Merging Parameter: %s", key)
|
||||||
param_merge(key, value, param_schemata[key])
|
param_merge(key, value, param_schemata[key])
|
||||||
else:
|
else:
|
||||||
|
LOG.debug("Overriding Parameter: %s", key)
|
||||||
old[key] = value
|
old[key] = value
|
||||||
|
|
||||||
return old, new_strategies
|
return old, new_strategies
|
||||||
|
|
Loading…
Reference in New Issue