From 1f43ca60a960f0032b153bc07d8965e67dc3743f Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Tue, 19 Sep 2017 07:51:34 -0700 Subject: [PATCH] Add gerrit_strip_branch_ref option Change-Id: Id388274a7b628ad40a0e943087ec82596791c982 See: I012485065e0fd8692e4f2ef787dd0a62be303314 --- manifests/init.pp | 1 + templates/zuul.conf.erb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 644d260..dd012ba 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -26,6 +26,7 @@ class zuul ( $gerrit_server = '', $gerrit_user = '', $gerrit_baseurl = '', + $gerrit_strip_branch_ref = '', $zuul_ssh_private_key = '', $layout_file_name = 'layout.yaml', $zookeeper_hosts = '127.0.0.1:2181', diff --git a/templates/zuul.conf.erb b/templates/zuul.conf.erb index df32db3..a59c011 100644 --- a/templates/zuul.conf.erb +++ b/templates/zuul.conf.erb @@ -14,6 +14,9 @@ sshkey=/var/lib/zuul/ssh/id_rsa <% if @gerrit_baseurl != "" -%> baseurl=<%= @gerrit_baseurl %> <% end -%> +<% if @gerrit_strip_branch_ref != "" -%> +strip_branch_ref=<%= @gerrit_strip_branch_ref %> +<% end -%> <% end -%> [zuul]