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

fix to allow jobs to run in dev server again

Browse Source
This commit is contained in:
AlanCoding
2016-02-16 08:29:05 -05:00
parent bed6c666ae
commit 6bd5d8553b
2 changed files with 5 additions and 5 deletions
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: else:
sys.stderr.write('%s\n' % str(e)) sys.stderr.write('%s\n' % str(e))
if hasattr(e, 'response'): 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) sys.exit(1)
def main(): def main():

5
awx/settings/defaults.py
View File

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