diff --git a/etc/zuul.conf-sample b/etc/zuul.conf-sample index bf1989516c..1065cecf4f 100644 --- a/etc/zuul.conf-sample +++ b/etc/zuul.conf-sample @@ -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 diff --git a/zuul/executor/server.py b/zuul/executor/server.py index 0adb6ded12..5aa970077b 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -239,6 +239,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: @@ -672,6 +678,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'))