opendev/system-config
Code Issues Proposed changes

Add a dedicated zuul server.

Browse Source 
Just bootstrapping the server; a follow-on change will switch
hostnames in configurations.

Change-Id: Ie453a3d046014137c66f2bc25e0a5916d09b9267
Reviewed-on: https://review.openstack.org/17167
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-11-29 13:43:20 -08:00 committed by Jenkins
parent a7ce7fd02e
commit e6b8848bcf
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/site.pp
View File

@ -72,7 +72,7 @@ node 'jenkins.openstack.org' {
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
} }
class { 'openstack_project::zuul': class { 'openstack_project::zuul':
jenkins_server => "https://${::fqdn}", jenkins_url => "https://${::fqdn}",
jenkins_user => 'hudson-openstack', jenkins_user => 'hudson-openstack',
jenkins_apikey => hiera('zuul_jenkins_apikey'), jenkins_apikey => hiera('zuul_jenkins_apikey'),
gerrit_server => 'review.openstack.org', gerrit_server => 'review.openstack.org',
@ -181,6 +181,19 @@ node 'static.openstack.org' {
} }
} }
node 'zuul.openstack.org' {
class { 'openstack_project::zuul':
jenkins_host => 'jenkins.openstack.org',
jenkins_url => 'https://jenkins.openstack.org',
jenkins_user => 'hudson-openstack',
jenkins_apikey => hiera('zuul_jenkins_apikey'),
gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins',
url_pattern => 'http://logs.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}',
sysadmins => hiera('sysadmins'),
}
}
# A bare machine, but with a jenkins user # A bare machine, but with a jenkins user
node /^.*\.template\.openstack\.org$/ { node /^.*\.template\.openstack\.org$/ {
include openstack_project::slave_template include openstack_project::slave_template

19
modules/openstack_project/manifests/zuul.pp
View File

@ -1,16 +1,29 @@
# == Class: openstack_project::zuul # == Class: openstack_project::zuul
# #
class openstack_project::zuul( class openstack_project::zuul(
$jenkins_server = '', $jenkins_host = '',
$jenkins_url = '',
$jenkins_user = '', $jenkins_user = '',
$jenkins_apikey = '', $jenkins_apikey = '',
$gerrit_server = '', $gerrit_server = '',
$gerrit_user = '', $gerrit_user = '',
$url_pattern = '' $url_pattern = '',
$sysadmins = []
) { ) {
$rules = [ "-m state --state NEW -m tcp -p tcp --dport 8001 -s ${jenkins_host} -j ACCEPT" ]
# TODO: This is temporary to handle the transition to a standalone server
if ($sysadmins != []) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443],
iptables_rules4 => $rules,
sysadmins => $sysadmins,
}
}
class { '::zuul': class { '::zuul':
jenkins_server => $jenkins_server, jenkins_server => $jenkins_url,
jenkins_user => $jenkins_user, jenkins_user => $jenkins_user,
jenkins_apikey => $jenkins_apikey, jenkins_apikey => $jenkins_apikey,
gerrit_server => $gerrit_server, gerrit_server => $gerrit_server,