opendev/puppet-openstackci
Code Issues Proposed changes

Merge "configure zuul with a non-default layout file"

Browse Source
This commit is contained in:
Jenkins 2016-06-07 08:56:06 +00:00 committed by Gerrit Code Review
commit 9148de20af
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/zuul_merger.pp
View File

@ -23,6 +23,7 @@ class openstackci::zuul_merger(
$gerrit_user = '', $gerrit_user = '',
$known_hosts_content = '', $known_hosts_content = '',
$zuul_ssh_private_key = '', $zuul_ssh_private_key = '',
$layout_file_name = 'layout.yaml',
$zuul_url = "http://${::fqdn}/p", $zuul_url = "http://${::fqdn}/p",
$git_email = 'zuul@domain.example', $git_email = 'zuul@domain.example',
$git_name = 'Zuul', $git_name = 'Zuul',
@ -38,6 +39,7 @@ class openstackci::zuul_merger(
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key, zuul_ssh_private_key => $zuul_ssh_private_key,
layout_file_name => $layout_file_name,
zuul_url => $zuul_url, zuul_url => $zuul_url,
git_email => $git_email, git_email => $git_email,
git_name => $git_name, git_name => $git_name,

2
manifests/zuul_scheduler.pp
View File

@ -23,6 +23,7 @@ class openstackci::zuul_scheduler(
$gerrit_user = '', $gerrit_user = '',
$known_hosts_content = '', $known_hosts_content = '',
$zuul_ssh_private_key = '', $zuul_ssh_private_key = '',
$layout_file_name = 'layout.yaml',
$url_pattern = '', $url_pattern = '',
$zuul_url = '', $zuul_url = '',
$job_name_in_report = true, $job_name_in_report = true,
@ -68,6 +69,7 @@ class openstackci::zuul_scheduler(
gerrit_user => $gerrit_user, gerrit_user => $gerrit_user,
zuul_ssh_private_key => $zuul_ssh_private_key, zuul_ssh_private_key => $zuul_ssh_private_key,
url_pattern => $url_pattern, url_pattern => $url_pattern,
layout_file_name => $layout_file_name,
zuul_url => $zuul_url, zuul_url => $zuul_url,
job_name_in_report => $job_name_in_report, job_name_in_report => $job_name_in_report,
status_url => $status_url, status_url => $status_url,