zuul
/
zuul
Code Issues Proposed changes

Merge "Properly handle missing ansible version in executor"

This commit is contained in:
Zuul 2019-03-18 18:53:40 +00:00 committed by Gerrit Code Review
parent bdd9ff50a1 b08ab2bb25
commit 10aedda3cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zuul/executor/server.py
View File

@ -707,7 +707,7 @@ class AnsibleJob(object):
'executor', 'variables')
plugin_dir = self.executor_server.ansible_manager.getAnsiblePluginDir(
self.arguments['ansible_version'])
self.arguments.get('ansible_version'))
self.library_dir = os.path.join(plugin_dir, 'library')
self.action_dir = os.path.join(plugin_dir, 'action')
self.action_dir_general = os.path.join(plugin_dir, 'actiongeneral')
@ -1118,7 +1118,7 @@ class AnsibleJob(object):
def runPlaybooks(self, args):
result = None
ansible_version = args['ansible_version']
ansible_version = args.get('ansible_version')
with open(self.jobdir.job_output_file, 'a') as job_output:
job_output.write("{now} | Running Ansible setup...\n".format(