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

Merge pull request #987 from AlanCoding/conn_err

Browse Source 
Step 1 to allow jobs to run in dev server again
This commit is contained in:
Chris Church 2016-02-23 12:04:07 -05:00
commit 718f70af23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,10 @@ class InventoryScript(object):
else:
sys.stderr.write('%s\n' % str(e))
if hasattr(e, 'response'):
sys.stderr.write('%s\n' % e.response.content)
if hasattr(e.response, 'content'):
sys.stderr.write('%s\n' % e.response.content)
else:
sys.stderr.write('%s\n' % e.response)
sys.exit(1)
def main():

5
awx/settings/defaults.py
View File

@ -662,10 +662,7 @@ ACTIVITY_STREAM_ENABLED = True
ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC = False
# Internal API URL for use by inventory scripts and callback plugin.
if 'devserver' in INSTALLED_APPS:
INTERNAL_API_URL = 'http://127.0.0.1:%s' % DEVSERVER_DEFAULT_PORT
else:
INTERNAL_API_URL = 'http://127.0.0.1:8000'
INTERNAL_API_URL = 'http://127.0.0.1:%s' % DEVSERVER_DEFAULT_PORT
# ZeroMQ callback settings.
CALLBACK_CONSUMER_PORT = "tcp://127.0.0.1:5556"