openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix an Ansible warning"

Browse Source
This commit is contained in:
Zuul 2020-12-16 09:37:33 +00:00 committed by Gerrit Code Review
commit f35f763068
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/action_plugins/merge_yaml.py
View File

@ -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):
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)