diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2021-06-22 12:59:53 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 09:29:53 +0530 |
| commit | 8e755707b9fd418ca2a097ce52ba8849c0181c14 (patch) | |
| tree | 362d66eb8e89946587f8f921c58e2a7ea70dac13 /lib/ansible/utils | |
| parent | c404a9003fbfc56785d32e3f6e6ab005d0467927 (diff) | |
| download | ansible-8e755707b9fd418ca2a097ce52ba8849c0181c14.tar.gz | |
Add 'hash_behaviour' option to include_vars module (#72944)
Diffstat (limited to 'lib/ansible/utils')
| -rw-r--r-- | lib/ansible/utils/vars.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/utils/vars.py b/lib/ansible/utils/vars.py index 17ef2df9de..7545f1d435 100644 --- a/lib/ansible/utils/vars.py +++ b/lib/ansible/utils/vars.py @@ -79,12 +79,12 @@ def _validate_mutable_mappings(a, b): ) -def combine_vars(a, b): +def combine_vars(a, b, merge=None): """ Return a copy of dictionaries of variables based on configured hash behavior """ - if C.DEFAULT_HASH_BEHAVIOUR == "merge": + if merge or merge is None and C.DEFAULT_HASH_BEHAVIOUR == "merge": return merge_hash(a, b) else: # HASH_BEHAVIOUR == 'replace' |