aboutsummaryrefslogtreecommitdiff
path: root/ansible/action_plugins
diff options
context:
space:
mode:
authorwu.chunyang <wuchunyang@yovole.com>2020-11-23 20:01:21 +0800
committerPierre Riteau <pierre@stackhpc.com>2020-11-23 12:10:54 +0000
commitfffd40f15bbacd9636679444e5c4a01b5067b2e5 (patch)
tree75b0359056fde625362a1d4bbcd435717a5174d5 /ansible/action_plugins
parentd6f339853803741af61c4c7628be1a24c94907d9 (diff)
downloadkolla-ansible-fffd40f15bbacd9636679444e5c4a01b5067b2e5.tar.gz
kolla-ansible-fffd40f15bbacd9636679444e5c4a01b5067b2e5.zip
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
Diffstat (limited to 'ansible/action_plugins')
-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)