zuul
/
zuul
Code Issues Proposed changes

Remove callback_whitelist setting 

All callback plugins listed in the explicit callback_plugins path are
loaded. callback_whitelist is apparently only for things that are
shipped with ansible.

Change-Id: I9ffd00cbd5aeffdb0c46f5aec19f54c6f16cf68b
This commit is contained in:
Monty Taylor 2017-07-27 16:59:02 -05:00
parent 7c7292292f
commit 2b586ace81
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zuul/executor/server.py
View File

@ -1289,10 +1289,8 @@ class AnsibleJob(object):
callback_path = '%s:%s' % (
self.executor_server.callback_dir,
os.path.dirname(ara_callbacks.__file__))
callback_whitelist = 'zuul_json,ara'
else:
callback_path = self.executor_server.callback_dir
callback_whitelist = 'zuul_json'
with open(jobdir_playbook.ansible_config, 'w') as config:
config.write('[defaults]\n')
config.write('hostfile = %s\n' % self.jobdir.inventory)
@ -1310,7 +1308,6 @@ class AnsibleJob(object):
config.write('command_warnings = False\n')
config.write('callback_plugins = %s\n' % callback_path)
config.write('stdout_callback = zuul_stream\n')
config.write('callback_whitelist = %s\n' % callback_whitelist)
# bump the timeout because busy nodes may take more than
# 10s to respond
config.write('timeout = 30\n')