Skip to content

Commit f196062

Browse files
wchy1001markgoddard
authored andcommitted
Fix an Ansible warning
set_available_variables is being deprecated. Use "@available_variables.setter" instead. Refer to: https://fossies.org/linux/ansible/lib/ansible/template/__init__.py Change-Id: I874318f78043d21d2aeebe4e0c35a304b5c94029 (cherry picked from commit fffd40f)
1 parent adedd23 commit f196062

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ansible/action_plugins/merge_yaml.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ def run(self, tmp=None, task_vars=None):
118118

119119
temp_vars = task_vars.copy()
120120
temp_vars.update(extra_vars)
121-
self._templar.set_available_variables(temp_vars)
121+
self._templar.available_variables = temp_vars
122122

123123
output = {}
124124
sources = self._task.args.get('sources', None)
@@ -130,7 +130,7 @@ def run(self, tmp=None, task_vars=None):
130130
output, self.read_config(source), extend_lists)
131131

132132
# restore original vars
133-
self._templar.set_available_variables(old_vars)
133+
self._templar.available_variables = old_vars
134134

135135
local_tempdir = tempfile.mkdtemp(dir=constants.DEFAULT_LOCAL_TMP)
136136

0 commit comments

Comments
 (0)