Skip to content
Snippets Groups Projects
Commit f35f7630 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Fix an Ansible warning"

parents edb3bce7 fffd40f1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/action_plugins/merge_yaml.py
+ 2
− 2
View file @ f35f7630
...@@ -118,7 +118,7 @@ class ActionModule(action.ActionBase): ...@@ -118,7 +118,7 @@ class ActionModule(action.ActionBase):
temp_vars = task_vars.copy() temp_vars = task_vars.copy()
temp_vars.update(extra_vars) temp_vars.update(extra_vars)
self._templar.set_available_variables(temp_vars) self._templar.available_variables = temp_vars
output = {} output = {}
sources = self._task.args.get('sources', None) sources = self._task.args.get('sources', None)
...@@ -130,7 +130,7 @@ class ActionModule(action.ActionBase): ...@@ -130,7 +130,7 @@ class ActionModule(action.ActionBase):
output, self.read_config(source), extend_lists) output, self.read_config(source), extend_lists)
# restore original vars # 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) local_tempdir = tempfile.mkdtemp(dir=constants.DEFAULT_LOCAL_TMP)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment