opendev/puppet-openstackci
Code Issues Proposed changes

configure zuul with a non-default layout file

Browse Source 
Enable to customize zuul with non-default layout file.
This is useful when there are several options for layout
files. All layout files should be available in /etc/zuul/layout

Change-Id: I047b632ebd32a5c7d83ac9a6a64cce6ddb990e8b
This commit is contained in:
Isaac Beckman 2016-05-16 12:58:18 +03:00
parent c4cb31d38e
commit 5d93d93eca
3 changed files with 5 additions and 1 deletions

2
manifests/single_node_ci.pp

@ -162,7 +162,7 @@ class openstackci::single_node_ci (
$smtp_default_from = "zuul@${vhost_name}", $smtp_default_from = "zuul@${vhost_name}",
$smtp_default_to = "zuul.reports@${vhost_name}", $smtp_default_to = "zuul.reports@${vhost_name}",
$zuul_revision = 'master', $zuul_revision = 'master',
$zuul_git_source_repo = 'https://git.openstack.org/openstack-infra/zuul', $zuul_git_source_repo = 'https://git.openstack.org/openstack-infra/zuul',
# Nodepool configurations # Nodepool configurations
$oscc_file_contents = undef, $oscc_file_contents = undef,

2
manifests/zuul_merger.pp

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

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