opendev/system-config
Code Issues Proposed changes

Fix bug preventing job builder from running.

Browse Source 
Also, remove jenkins2 node.

Change-Id: I4cb8c5b23e0a93b2b5b72ba831e052542f5f5b2a
Reviewed-on: https://review.openstack.org/14684
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-10-23 09:28:25 -07:00 committed by Jenkins
parent f4be59e686
commit ad5ddbb2a4
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/site.pp
View File

@ -97,18 +97,6 @@ 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'),

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

@ -24,7 +24,7 @@ class openstack_project::jenkins (
ssl_chain_file_contents => $ssl_chain_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents,
} }
if manage_jenkins_jobs == true { if $manage_jenkins_jobs == true {
class { '::jenkins::job_builder': class { '::jenkins::job_builder':
url => "https://${vhost_name}/", url => "https://${vhost_name}/",
username => 'gerrig', # This is not a typo, well it isn't anymore. username => 'gerrig', # This is not a typo, well it isn't anymore.