Rework the callback emitter a little more, purge tower internals from

the module and fallback to the older codebase's mechanism.   Make sure
we are passing the callback port as a string otherwise it seems to
corrupt the shell
This commit is contained in:
Matthew Jones
2014-12-03 11:26:51 -05:00
parent 8a2a829bac
commit fcc7d3d7b1
2 changed files with 33 additions and 7 deletions

View File

@@ -585,7 +585,7 @@ class RunJob(BaseTask):
env['ANSIBLE_CALLBACK_PLUGINS'] = plugin_dir
env['REST_API_URL'] = settings.INTERNAL_API_URL
env['REST_API_TOKEN'] = job.task_auth_token or ''
#env['CALLBACK_CONSUMER_PORT'] = settings.CALLBACK_CONSUMER_PORT
env['CALLBACK_CONSUMER_PORT'] = str(settings.CALLBACK_CONSUMER_PORT)
if getattr(settings, 'JOB_CALLBACK_DEBUG', False):
env['JOB_CALLBACK_DEBUG'] = '2'
elif settings.DEBUG: