Merge pull request #12538 from yesbox/url_lookup_plugin_httperror_fix

Fix url lookup plugin HTTPError message not being reachable
pull/12626/head
Brian Coca 9 years ago
commit 4ba5ebd1c8

@ -36,10 +36,10 @@ class LookupModule(LookupBase):
self._display.vvvv("url lookup connecting to %s" % term) self._display.vvvv("url lookup connecting to %s" % term)
try: try:
response = open_url(term, validate_certs=validate_certs) response = open_url(term, validate_certs=validate_certs)
except urllib2.URLError as e:
raise AnsibleError("Failed lookup url for %s : %s" % (term, str(e)))
except urllib2.HTTPError as e: except urllib2.HTTPError as e:
raise AnsibleError("Received HTTP error for %s : %s" % (term, str(e))) raise AnsibleError("Received HTTP error for %s : %s" % (term, str(e)))
except urllib2.URLError as e:
raise AnsibleError("Failed lookup url for %s : %s" % (term, str(e)))
except SSLValidationError as e: except SSLValidationError as e:
raise AnsibleError("Error validating the server's certificate for %s: %s" % (term, str(e))) raise AnsibleError("Error validating the server's certificate for %s: %s" % (term, str(e)))
except ConnectionError as e: except ConnectionError as e:

Loading…
Cancel
Save