opendev
/
system-config
Code Issues Proposed changes

Zuul puppet support to zuul_url option 

This adds the zuul_url support in puppet.

Change-Id: Ie37744f11452efc4029c1fe93d880dd3a4ecb831
This commit is contained in:
Arx Cruz 2013-11-27 09:58:47 -02:00
parent dde3d047d7
commit 5e5023ebae
5 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -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 => [

2
modules/openstack_project/manifests/zuul_dev.pp
View File

@ -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/',

2
modules/openstack_project/manifests/zuul_prod.pp
View File

@ -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/',

1
modules/zuul/manifests/init.pp
View File

@ -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,

1
modules/zuul/templates/zuul.conf.erb
View File

@ -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 %>