From 1e33e9c09d72d2bd99295ab026bf561470490c77 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 16 Apr 2018 16:23:23 -0400 Subject: [PATCH] Additional settings for zuul.conf A few settings needed to run zuul, git username / email for mergers and path to SSH key needed for executor. Change-Id: I4d93c2716f2ab5b74539856ca862a90c75e7fbc1 Signed-off-by: Paul Belanger --- config/zuul/zuul.conf.j2 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/zuul/zuul.conf.j2 b/config/zuul/zuul.conf.j2 index 94ff897..eeed9b5 100644 --- a/config/zuul/zuul.conf.j2 +++ b/config/zuul/zuul.conf.j2 @@ -31,6 +31,7 @@ server = {{ hostvars['statsd01'].ansible_host }} [executor] finger_port = 17979 log_config = /etc/zuul/executor-logging.conf +private_key_file = {{ zuul_user_home }}/.ssh/nodepool_id_rsa workspace_root = {{ zuul_user_home }}/workspace [fingergw] @@ -40,6 +41,8 @@ user = {{ zuul_user_name }} [merger] git_dir = {{ zuul_user_home }}/git +git_user_email = windmill@example.org +git_user_name = windmill log_config = /etc/zuul/merger-logging.conf pidfile = /var/run/zuul-merger/zuul-merger.pid zuul_url = {{ hostvars['zs01'].ansible_host }}