From 18568882b8d0c3f45cdac9f4418e48cb3f474e6f Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 24 Apr 2020 15:36:31 -0700 Subject: [PATCH] Fix zuul.conf jinja2 template This adds a necessary newline, removes port numbers, and sets the executor ssh key to the correct path. Change-Id: I6b4afa876b6cd7d8f87cc35bc51b4e9d6e31ee2b --- .zuul.yaml | 10 ++++++++++ playbooks/roles/zuul/templates/zuul.conf.j2 | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c87834b33a..5bf5865169 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1597,6 +1597,16 @@ - playbooks/service-letsencrypt.yaml - playbooks/service-zookeeper.yaml - playbooks/service-zuul.yaml + host-vars: + zm01.openstack.org: + host_copy_output: + '/etc/zuul/zuul.conf': logs + ze01.openstack.org: + host_copy_output: + '/etc/zuul/zuul.conf': logs + zuul01.openstack.org: + host_copy_output: + '/etc/zuul/zuul.conf': logs files: - playbooks/install-ansible.yaml - playbooks/service-zookeeper.yaml diff --git a/playbooks/roles/zuul/templates/zuul.conf.j2 b/playbooks/roles/zuul/templates/zuul.conf.j2 index a095be6c87..eb8d512cb6 100644 --- a/playbooks/roles/zuul/templates/zuul.conf.j2 +++ b/playbooks/roles/zuul/templates/zuul.conf.j2 @@ -28,7 +28,8 @@ relative_priority=true user=zuul [zookeeper] -hosts={% for host in groups['zookeeper'] %}{{ (hostvars[host].ansible_default_ipv4.address) }}:2888:3888{% if not loop.last %},{% endif %}{% endfor %} +hosts={% for host in groups['zookeeper'] %}{{ (hostvars[host].ansible_default_ipv4.address) }}{% if not loop.last %},{% endif %}{% endfor %} + session_timeout=40 [statsd] @@ -45,7 +46,7 @@ manage_ansible=false log_config=/etc/zuul/executor-logging.conf job_dir=/var/lib/zuul/builds variables=/opt/project-config/zuul/site-variables.yaml -private_key_file=/var/lib/zuul/ssh/id_rsa +private_key_file=/var/lib/zuul/ssh/nodepool_id_rsa trusted_ro_paths=/etc/openafs:/etc/ssl/certs:/var/lib/zuul/ssh trusted_rw_paths=/afs untrusted_ro_paths=/etc/ssl/certs