opendev/puppet-jenkins
Code Issues Proposed changes

Revert "Enable Gearman as default on Jenkins slaves"

Browse Source 
SERVER: Invalid relationship: File[/var/lib/jenkins/hudson.plugins.gearman.GearmanPluginConfig.xml] { require => Class[Zuul] }, because Class[Zuul]doesn't seem to be in the catalog

This reverts commit 2a9cd677e4eb6a60787ebc73bd8fd9e1b6f26b34
This commit is contained in:
James E. Blair 2014-03-31 22:49:41 +00:00 committed by Gerrit Code Review
parent 5992be1ec4
commit 22a9d1fbc0
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/master.pp
View File

@ -4,9 +4,6 @@ class jenkins::master(
$logo = '',
$vhost_name = $::fqdn,
$serveradmin = "webmaster@${::fqdn}",
$gearman_server = '127.0.0.1',
$gearman_enable = true,
$gearman_port = '4730',
$ssl_cert_file = '',
$ssl_key_file = '',
$ssl_chain_file = '',
@ -165,17 +162,6 @@ class jenkins::master(
require => File['/var/lib/jenkins'],
}
file {'/var/lib/jenkins/hudson.plugins.gearman.GearmanPluginConfig.xml':
ensure => present,
content => template('jenkins/gearman-plugin.xml.erb'),
owner => 'jenkins',
group => 'adm',
require => [
Class['zuul'],
File['/var/lib/jenkins'],
],
}
file { '/var/lib/jenkins/plugins/simple-theme-plugin':
ensure => directory,
owner => 'jenkins',

6
templates/gearman-plugin.xml.erb
View File

@ -1,6 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson.plugins.gearman.GearmanPluginConfig plugin="gearman-plugin@0.0.6">
<enablePlugin><%= gearman_enable %></enablePlugin>
<host><%= gearman_server %></host>
<port><%= gearman_port %></port>
</hudson.plugins.gearman.GearmanPluginConfig>