External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 21:51:26 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2441 from AlanCoding/error_message

Browse Source 
Fix regression: include error message from remote server
This commit is contained in:
Alan Rominger 2018-07-09 13:51:06 -04:00 committed by GitHub
commit 2dd3014374
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/plugins/inventory/tower.py
View File

@ -108,7 +108,10 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_
verify=not ignore_ssl)
if not response.ok:
# If the GET /api/v2/inventories/N/script is not HTTP 200, print the error code
raise RuntimeError("Connection to remote host failed: {}".format(response))
msg = "Connection to remote host failed: {}".format(response)
if response.text:
msg += " with message: {}".format(response.text)
raise RuntimeError(msg)
try:
# Attempt to parse JSON
return response.json()