Merge "Fix an Ansible warning" into stable/victoria

Author: Zuul

ansible/action_plugins/merge_yaml.py

@@ -118,7 +118,7 @@ def run(self, tmp=None, task_vars=None):
 
         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 @@ def run(self, tmp=None, task_vars=None):
                 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)