zuul
/
zuul
Code Issues Proposed changes

Merge "Re-add the ability to set username on zuul-executor" into feature/zuulv3

This commit is contained in:
Jenkins 2017-06-07 12:36:41 +00:00 committed by Gerrit Code Review
parent b1f74b1a90 f12b1d317a
commit 38e8f77a20
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/zuul.conf-sample
View File

@ -18,6 +18,9 @@ git_dir=/var/lib/zuul/git
;git_user_name=zuul
zuul_url=http://zuul.example.com/p
[executor]
default_username=zuul
[webapp]
listen_address=0.0.0.0
port=8001

7
zuul/executor/server.py
View File

@ -377,6 +377,12 @@ class ExecutorServer(object):
else:
self.merge_root = '/var/lib/zuul/executor-git'
if self.config.has_option('executor', 'default_username'):
self.default_username = self.config.get('executor',
'default_username')
else:
self.default_username = 'zuul'
if self.config.has_option('merger', 'git_user_email'):
self.merge_email = self.config.get('merger', 'git_user_email')
else:
@ -907,6 +913,7 @@ class AnsibleJob(object):
ip = node.get('interface_ip')
host_vars = dict(
ansible_host=ip,
ansible_user=self.executor_server.default_username,
nodepool_az=node.get('az'),
nodepool_provider=node.get('provider'),
nodepool_region=node.get('region'))