Merge branch 'always_run-6' of https://github.com/stoned/ansible into stoned-always_run-6

This commit is contained in:
James Cammarata
2013-08-22 12:10:28 -05:00
14 changed files with 136 additions and 13 deletions

View File

@@ -155,7 +155,10 @@ def is_changed(result):
return (result.get('changed', False) in [ True, 'True', 'true'])
def check_conditional(conditional, basedir, inject, fail_on_undefined=False):
def check_conditional(conditional, basedir, inject, fail_on_undefined=False, jinja2=False):
if jinja2:
conditional = "jinja2_compare %s" % conditional
if conditional.startswith("jinja2_compare"):
conditional = conditional.replace("jinja2_compare ","")