cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'assert-with-msg' of https://github.com/darkk/ansible into darkk-assert-with-msg

Browse source
This commit is contained in:
James Cammarata 2014-07-08 13:56:08 -05:00
commit 16332b8488
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/runner/action_plugins/assert.py
View file

@ -38,7 +38,7 @@ class ActionModule(object):
args.update(complex_args)
args.update(utils.parse_kv(module_args))
msg = ''
msg = 'assertion failed'
if 'msg' in args:
msg = args['msg']
@ -52,6 +52,6 @@ class ActionModule(object):
for that in args['that']:
result = utils.check_conditional(that, self.runner.basedir, inject, fail_on_undefined=True)
if not result:
return ReturnData(conn=conn, result=dict(failed=True, assertion=that, evaluated_to=result))
return ReturnData(conn=conn, result=dict(failed=True, msg=msg, assertion=that, evaluated_to=result))
return ReturnData(conn=conn, result=dict(msg='all assertions passed'))