From 2ede7d31e38f20e40beded64a01c0d7ded30dc03 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 12 Oct 2012 10:55:41 -0700
Subject: [PATCH] Add jenkins2 node.

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
---
 manifests/site.pp                             | 12 ++++++
 .../openstack_project/manifests/jenkins.pp    | 39 ++++++++++---------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/manifests/site.pp b/manifests/site.pp
index a705b293ec..53ab863d75 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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' {
   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 ca78f071ea..92d5190e68 100644
--- a/modules/openstack_project/manifests/jenkins.pp
+++ b/modules/openstack_project/manifests/jenkins.pp
@@ -1,11 +1,11 @@
 class openstack_project::jenkins (
   $jenkins_jobs_password,
+  $manage_jenkins_jobs = true,
   $ssl_cert_file_contents = '',
   $ssl_key_file_contents = '',
   $ssl_chain_file_contents = '',
   $sysadmins = [],
 ) {
-
   class { 'openstack_project::server':
     iptables_public_tcp_ports => [80, 443, 4155],
     sysadmins                 => $sysadmins
@@ -24,25 +24,26 @@ class openstack_project::jenkins (
     ssl_chain_file_contents => $ssl_chain_file_contents,
   }
 
-  class { '::jenkins::job_builder':
-    url      => "https://${vhost_name}/",
-    username => 'gerrig',
-    password => $jenkins_jobs_password,
-  }
+  if manage_jenkins_jobs == true {
+    class { '::jenkins::job_builder':
+      url      => "https://${vhost_name}/",
+      username => 'gerrig',
+      password => $jenkins_jobs_password,
+    }
 
-  file { '/etc/jenkins_jobs/config':
-    ensure  => directory,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0755',
-    recurse => true,
-    source  => ['puppet:///modules/openstack_project/jenkins_job_builder/config'],
-    notify  => Exec['jenkins_jobs_update']
-  }
+    file { '/etc/jenkins_jobs/config':
+      ensure  => directory,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0755',
+      recurse => true,
+      source  => ['puppet:///modules/openstack_project/jenkins_job_builder/config'],
+      notify  => Exec['jenkins_jobs_update']
+    }
 
-  file { '/etc/default/jenkins':
-    ensure => present,
-    source => 'puppet:///modules/openstack_project/jenkins/jenkins.default'
+    file { '/etc/default/jenkins':
+      ensure => present,
+      source => 'puppet:///modules/openstack_project/jenkins/jenkins.default'
+    }
   }
-
 }