aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xansible/action_plugins/merge_yaml.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py
index 90ed82b76..929576693 100755
--- a/ansible/action_plugins/merge_yaml.py
+++ b/ansible/action_plugins/merge_yaml.py
@@ -118,7 +118,7 @@ class ActionModule(action.ActionBase):
temp_vars = task_vars.copy()
temp_vars.update(extra_vars)
- self._templar.set_available_variables(temp_vars)
+ self._templar.available_variables = temp_vars
output = {}
sources = self._task.args.get('sources', None)
@@ -130,7 +130,7 @@ class ActionModule(action.ActionBase):
output, self.read_config(source), extend_lists)
# restore original vars
- self._templar.set_available_variables(old_vars)
+ self._templar.available_variables = old_vars
local_tempdir = tempfile.mkdtemp(dir=constants.DEFAULT_LOCAL_TMP)