Merge pull request #6649 from picsolvebryan/devel

Accept status code from a list of valid codes.
This commit is contained in:
Michael DeHaan 2014-03-28 11:49:04 -04:00
commit eb1c37c6e1

View file

@ -106,7 +106,7 @@ options:
required: false
status_code:
description:
- A valid, numeric, HTTP status code that signifies success of the request.
- A valid, numeric, HTTP status code that signifies success of the request. Can also be comma separated list of status codes.
required: false
default: 200
timeout:
@ -335,7 +335,7 @@ def main():
follow_redirects = dict(required=False, default='safe', choices=['all', 'safe', 'none', 'yes', 'no']),
creates = dict(required=False, default=None),
removes = dict(required=False, default=None),
status_code = dict(required=False, default=200, type='int'),
status_code = dict(required=False, default=[200], type='list'),
timeout = dict(required=False, default=30, type='int'),
),
check_invalid_arguments=False,
@ -358,7 +358,7 @@ def main():
redirects = module.params['follow_redirects']
creates = module.params['creates']
removes = module.params['removes']
status_code = int(module.params['status_code'])
status_code = [int(x) for x in list(module.params['status_code'])]
socket_timeout = module.params['timeout']
# Grab all the http headers. Need this hack since passing multi-values is currently a bit ugly. (e.g. headers='{"Content-Type":"application/json"}')
@ -427,7 +427,7 @@ def main():
uresp['json'] = js
except:
pass
if resp['status'] != status_code:
if resp['status'] not in status_code:
module.fail_json(msg="Status code was not " + str(status_code), content=content, **uresp)
elif return_content:
module.exit_json(changed=changed, content=content, **uresp)