From ad5ddbb2a4755f450e85f711238028d787f9fc16 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Tue, 23 Oct 2012 09:28:25 -0700
Subject: [PATCH] Fix bug preventing job builder from running.
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
---
manifests/site.pp | 12 ------------
modules/openstack_project/manifests/jenkins.pp | 2 +-
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index c25b351105..7ddd850c3f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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' {
class { 'openstack_project::jenkins_dev':
sysadmins => hiera('sysadmins'),
diff --git a/modules/openstack_project/manifests/jenkins.pp b/modules/openstack_project/manifests/jenkins.pp
index 2759b71265..fa7073dda6 100644
--- a/modules/openstack_project/manifests/jenkins.pp
+++ b/modules/openstack_project/manifests/jenkins.pp
@@ -24,7 +24,7 @@ class openstack_project::jenkins (
ssl_chain_file_contents => $ssl_chain_file_contents,
}
- if manage_jenkins_jobs == true {
+ if $manage_jenkins_jobs == true {
class { '::jenkins::job_builder':
url => "https://${vhost_name}/",
username => 'gerrig', # This is not a typo, well it isn't anymore.