diff --git a/manifests/init.pp b/manifests/init.pp index dd012ba..6c8af35 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -30,6 +30,7 @@ class zuul ( $zuul_ssh_private_key = '', $layout_file_name = 'layout.yaml', $zookeeper_hosts = '127.0.0.1:2181', + $zookeeper_session_timeout = undef, $tenant_file_name = 'main.yaml', $url_pattern = '', $status_url = "https://${::fqdn}/", diff --git a/templates/zuulv3.conf.erb b/templates/zuulv3.conf.erb index e8ef32b..72d1b91 100644 --- a/templates/zuulv3.conf.erb +++ b/templates/zuulv3.conf.erb @@ -34,6 +34,9 @@ status_url=<%= @status_url %> [zookeeper] hosts=<%= @zookeeper_hosts %> +<% if @zookeeper_session_timeout != nil -%> +session_timeout=<%= @zookeeper_session_timeout %> +<% end -%> [merger] git_dir=/var/lib/zuul/git