internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for saving conditionals in variable expressions.

Browse Source
This commit is contained in:
Michael DeHaan
2013-07-21 08:52:00 -04:00
parent ca512c7d2f
commit 62b39d3de5
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ansible/runner/__init__.py
View File

@@ -528,8 +528,7 @@ class Runner(object):
self.conditional = [ self.conditional ]
for cond in self.conditional:
cond = template.template(self.basedir, cond, inject, expand_lists=False)
if not utils.check_conditional(cond):
if not utils.check_conditional(cond, self.basedir, inject):
result = utils.jsonify(dict(changed=False, skipped=True))
self.callbacks.on_skipped(host, inject.get('item',None))
return ReturnData(host=host, result=result)

2
lib/ansible/runner/action_plugins/group_by.py
View File

@@ -58,7 +58,7 @@ class ActionModule(object):
data = {}
data.update(inject)
data.update(inject['hostvars'][host])
if not check_conditional(template.template(self.runner.basedir, self.runner.conditional, data)):
if not check_conditional(self.runner.basedir, self.runner.conditional, data):
continue
group_name = template.template(self.runner.basedir, args['key'], data)
group_name = group_name.replace(' ','-')