diff options
| author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-07-20 23:09:59 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-07-20 23:09:59 -0700 |
| commit | 626977f90e68282db4449f4cd3d8be7361cef597 (patch) | |
| tree | 39d74ad5622bf37917fe5323e9ac4d3a78348414 | |
| parent | 79173ac18de66bcdb6c25729fb4561c772d37cab (diff) | |
| download | ansible-modules-extras-626977f90e68282db4449f4cd3d8be7361cef597.tar.gz | |
Port librarto_annotation from urllib2 to fetch_urlfetch_url-librato
| -rw-r--r-- | monitoring/librato_annotation.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/monitoring/librato_annotation.py b/monitoring/librato_annotation.py index c606dfdc..4927a9cf 100644 --- a/monitoring/librato_annotation.py +++ b/monitoring/librato_annotation.py @@ -105,9 +105,6 @@ EXAMPLES = ''' end_time: 1395954406 ''' - -import urllib2 - def post_annotation(module): user = module.params['user'] api_key = module.params['api_key'] @@ -134,10 +131,9 @@ def post_annotation(module): headers = {} headers['Content-Type'] = 'application/json' headers['Authorization'] = "Basic " + base64.b64encode(user + ":" + api_key).strip() - req = urllib2.Request(url, json_body, headers) - try: - response = urllib2.urlopen(req) - except urllib2.HTTPError, e: + + response, info = fetch_url(module, url, data=json_body, headers=headers) + if info['status'] != 200: module.fail_json(msg="Request Failed", reason=e.reason) response = response.read() module.exit_json(changed=True, annotation=response) @@ -161,4 +157,6 @@ def main(): post_annotation(module) from ansible.module_utils.basic import * -main() +from ansible.module_utils.urls import * +if __name__ == '__main__': + main() |