executor: Fix 'merge_jobs' configuration

Change-Id: Id1e38651c2a95d17d00cd57b7ee3f04351539af6
This commit is contained in:
Guillaume Chauvel 2020-06-06 12:43:31 +02:00
parent b79a83f323
commit 7ebd2fcf18
1 changed files with 2 additions and 1 deletions

View File

@ -2650,7 +2650,8 @@ class ExecutorServer(BaseMergeServer):
self.ansible_manager.install()
self.ansible_manager.copyAnsibleFiles()
self.process_merge_jobs = self.config, 'executor', 'merge_jobs', True
self.process_merge_jobs = get_default(self.config, 'executor',
'merge_jobs', True)
function_name = 'executor:execute'
if self.zone: