diff --git a/manifests/site.pp b/manifests/site.pp index f00dce2473..231d2c5141 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -417,6 +417,7 @@ node 'zuul.openstack.org' { gerrit_user => 'jenkins', zuul_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}', + zuul_url => 'http://zuul.openstack.org/p', sysadmins => hiera('sysadmins'), statsd_host => 'graphite.openstack.org', gearman_workers => [ @@ -435,6 +436,7 @@ node 'zuul-dev.openstack.org' { gerrit_user => 'zuul-dev', zuul_ssh_private_key => hiera('zuul_dev_ssh_private_key_contents'), url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}', + zuul_url => 'http://zuul-dev.openstack.org/p', sysadmins => hiera('sysadmins'), statsd_host => 'graphite.openstack.org', gearman_workers => [ diff --git a/modules/openstack_project/manifests/zuul_dev.pp b/modules/openstack_project/manifests/zuul_dev.pp index 7ffab57a00..ce7556fbd2 100644 --- a/modules/openstack_project/manifests/zuul_dev.pp +++ b/modules/openstack_project/manifests/zuul_dev.pp @@ -6,6 +6,7 @@ class openstack_project::zuul_dev( $gerrit_user = '', $zuul_ssh_private_key = '', $url_pattern = '', + $zuul_url = '', $sysadmins = [], $statsd_host = '', $gearman_workers = [] @@ -26,6 +27,7 @@ class openstack_project::zuul_dev( gerrit_user => $gerrit_user, zuul_ssh_private_key => $zuul_ssh_private_key, url_pattern => $url_pattern, + zuul_url => $zuul_url, push_change_refs => false, job_name_in_report => true, status_url => 'http://zuul-dev.openstack.org/', diff --git a/modules/openstack_project/manifests/zuul_prod.pp b/modules/openstack_project/manifests/zuul_prod.pp index 67818fc78d..0c377f1700 100644 --- a/modules/openstack_project/manifests/zuul_prod.pp +++ b/modules/openstack_project/manifests/zuul_prod.pp @@ -6,6 +6,7 @@ class openstack_project::zuul_prod( $gerrit_user = '', $zuul_ssh_private_key = '', $url_pattern = '', + $zuul_url = '', $sysadmins = [], $statsd_host = '', $gearman_workers = [] @@ -26,6 +27,7 @@ class openstack_project::zuul_prod( gerrit_user => $gerrit_user, zuul_ssh_private_key => $zuul_ssh_private_key, url_pattern => $url_pattern, + zuul_url => $zuul_url, push_change_refs => false, job_name_in_report => true, status_url => 'http://status.openstack.org/zuul/', diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp index 432c85c589..996ce04b51 100644 --- a/modules/zuul/manifests/init.pp +++ b/modules/zuul/manifests/init.pp @@ -27,6 +27,7 @@ class zuul ( $zuul_ssh_private_key = '', $url_pattern = '', $status_url = "https://${::fqdn}/", + $zuul_url = '', $git_source_repo = 'https://git.openstack.org/openstack-infra/zuul', $push_change_refs = false, $job_name_in_report = false, diff --git a/modules/zuul/templates/zuul.conf.erb b/modules/zuul/templates/zuul.conf.erb index 0ccc302cf4..7302201776 100644 --- a/modules/zuul/templates/zuul.conf.erb +++ b/modules/zuul/templates/zuul.conf.erb @@ -19,3 +19,4 @@ push_change_refs=<%= push_change_refs %> url_pattern=<%= url_pattern %> status_url=<%= status_url %> job_name_in_report=<%= job_name_in_report %> +zuul_url=<%= zuul_url %>