diff --git a/modules/openstack_project/manifests/zuul.pp b/modules/openstack_project/manifests/zuul.pp index 943dc28277..232b05c1f5 100644 --- a/modules/openstack_project/manifests/zuul.pp +++ b/modules/openstack_project/manifests/zuul.pp @@ -10,12 +10,13 @@ class openstack_project::zuul( ) { class { '::zuul': - jenkins_server => $jenkins_server, - jenkins_user => $jenkins_user, - jenkins_apikey => $jenkins_apikey, - gerrit_server => $gerrit_server, - gerrit_user => $gerrit_user, - url_pattern => $url_pattern, + jenkins_server => $jenkins_server, + jenkins_user => $jenkins_user, + jenkins_apikey => $jenkins_apikey, + gerrit_server => $gerrit_server, + gerrit_user => $gerrit_user, + url_pattern => $url_pattern, + push_change_refs => true } file { '/etc/zuul/layout.yaml': diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp index 8e850b6bd0..dd08ffb02a 100644 --- a/modules/zuul/manifests/init.pp +++ b/modules/zuul/manifests/init.pp @@ -7,7 +7,8 @@ class zuul ( $gerrit_user, $url_pattern, $status_url = "https://${::fqdn}/zuul/status", - $git_source_repo = 'https://github.com/openstack-ci/zuul.git' + $git_source_repo = 'https://github.com/openstack-ci/zuul.git', + $push_change_refs = false ) { $packages = [ 'python-webob', diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb index a0b96a5118..960cf5559a 100644 --- a/modules/zuul/templates/zuul.conf.erb +++ b/modules/zuul/templates/zuul.conf.erb @@ -13,6 +13,6 @@ layout_config=/etc/zuul/layout.yaml log_config=/etc/zuul/logging.conf state_dir=/var/lib/zuul git_dir=/var/lib/zuul/git -push_change_refs=true +push_change_refs=<%= push_change_refs %> url_pattern=<%= url_pattern %> status_url=<%= status_url %>