Various small fixes to boolean usage, using module.params.get and default values

This commit is contained in:
Dag Wieers
2012-10-07 22:06:20 +02:00
parent 250f52bfba
commit 5503cfaa44
4 changed files with 47 additions and 35 deletions

View File

@@ -68,13 +68,17 @@ def main():
)
)
if module.params['fail'] in BOOLEANS_TRUE and module.params['rc'] == 0:
module.params['rc'] = 1
fail = module.boolean(module.params.get('fail'))
msg = module.params.get('msg')
rc = module.params.get('rc')
if module.params['fail'] in BOOLEANS_TRUE:
module.fail_json(rc=module.params['rc'], msg=module.params['msg'])
if fail and rc == 0:
rc = 1
if fail:
module.fail_json(rc=rc, msg=msg)
else:
module.exit_json(msg=module.params['msg'])
module.exit_json(msg=msg)
# this is magic, see lib/ansible/module_common.py
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>