opendev/system-config
Code Issues Proposed changes

Add jenkins2 node.

Browse Source 
Add a node for jenkins2 (what will be the new openstack rackspace
jenkins server). Do not include zuul configs and modify
openstack_project::jenkins to disable Jenkins Job Builder.

Change-Id: Iced5cb3b287452c5570ab3dcd2d84441fff55147
Reviewed-on: https://review.openstack.org/14403
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-10-12 10:55:41 -07:00 committed by Jenkins
parent e59caeddc5
commit 2ede7d31e3
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/site.pp
View File

@ -97,6 +97,18 @@ node 'jenkins.openstack.org' {
} }
} }
node 'jenkins2.openstack.org' {
class { 'openstack_project::jenkins':
# Explicitly disable Jenkins Job Builder
jenkins_jobs_password => '',
manage_jenkins_jobs => false,
ssl_cert_file_contents => hiera('jenkins_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('jenkins_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('jenkins_ssl_chain_file_contents'),
sysadmins => hiera('safesysadmins'),
}
}
node 'jenkins-dev.openstack.org' { node 'jenkins-dev.openstack.org' {
class { 'openstack_project::jenkins_dev': class { 'openstack_project::jenkins_dev':
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),

39
modules/openstack_project/manifests/jenkins.pp
View File

@ -1,11 +1,11 @@
class openstack_project::jenkins ( class openstack_project::jenkins (
$jenkins_jobs_password, $jenkins_jobs_password,
$manage_jenkins_jobs = true,
$ssl_cert_file_contents = '', $ssl_cert_file_contents = '',
$ssl_key_file_contents = '', $ssl_key_file_contents = '',
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
$sysadmins = [], $sysadmins = [],
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443, 4155], iptables_public_tcp_ports => [80, 443, 4155],
sysadmins => $sysadmins sysadmins => $sysadmins
@ -24,25 +24,26 @@ class openstack_project::jenkins (
ssl_chain_file_contents => $ssl_chain_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents,
} }
class { '::jenkins::job_builder': if manage_jenkins_jobs == true {
url => "https://${vhost_name}/", class { '::jenkins::job_builder':
username => 'gerrig', url => "https://${vhost_name}/",
password => $jenkins_jobs_password, username => 'gerrig',
} password => $jenkins_jobs_password,
}
file { '/etc/jenkins_jobs/config': file { '/etc/jenkins_jobs/config':
ensure => directory, ensure => directory,
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0755', mode => '0755',
recurse => true, recurse => true,
source => ['puppet:///modules/openstack_project/jenkins_job_builder/config'], source => ['puppet:///modules/openstack_project/jenkins_job_builder/config'],
notify => Exec['jenkins_jobs_update'] notify => Exec['jenkins_jobs_update']
} }
file { '/etc/default/jenkins': file { '/etc/default/jenkins':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/jenkins/jenkins.default' source => 'puppet:///modules/openstack_project/jenkins/jenkins.default'
}
} }
} }