Revert "Enable Gearman as default on Jenkins slaves"

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 2a9cd677e4

manifests/site.pp

@@ -78,7 +78,6 @@ node 'jenkins.openstack.org' {
     zmq_event_receivers     => ['logstash.openstack.org',
                                 'nodepool.openstack.org',
     ],
-    gearman_server          => 'zuul.openstack.org',
   }
 }
 
@@ -93,7 +92,6 @@ node 'jenkins01.openstack.org' {
     zmq_event_receivers     => ['logstash.openstack.org',
                                 'nodepool.openstack.org',
     ],
-    gearman_server          => 'zuul.openstack.org',
   }
 }
 
@@ -108,7 +106,6 @@ node 'jenkins02.openstack.org' {
     zmq_event_receivers     => ['logstash.openstack.org',
                                 'nodepool.openstack.org',
     ],
-    gearman_server          => 'zuul.openstack.org',
   }
 }
 
@@ -123,7 +120,6 @@ node 'jenkins03.openstack.org' {
     zmq_event_receivers     => ['logstash.openstack.org',
                                 'nodepool.openstack.org',
     ],
-    gearman_server          => 'zuul.openstack.org',
   }
 }
 
@@ -138,7 +134,6 @@ node 'jenkins04.openstack.org' {
     zmq_event_receivers     => ['logstash.openstack.org',
                                 'nodepool.openstack.org',
     ],
-    gearman_server          => 'zuul.openstack.org',
   }
 }
 
@@ -153,7 +148,6 @@ node 'jenkins05.openstack.org' {
     zmq_event_receivers     => ['logstash.openstack.org',
                                 'nodepool.openstack.org',
     ],
-    gearman_server          => 'zuul.openstack.org',
   }
 }
 
@@ -168,7 +162,6 @@ node 'jenkins06.openstack.org' {
     zmq_event_receivers     => ['logstash.openstack.org',
                                 'nodepool.openstack.org',
     ],
-    gearman_server          => 'zuul.openstack.org',
   }
 }
 
@@ -183,7 +176,6 @@ node 'jenkins07.openstack.org' {
     zmq_event_receivers     => ['logstash.openstack.org',
                                 'nodepool.openstack.org',
     ],
-    gearman_server          => 'zuul.openstack.org',
   }
 }
 
@@ -200,7 +192,6 @@ node 'jenkins-dev.openstack.org' {
     hpcloud_username         => hiera('nodepool_hpcloud_username'),
     hpcloud_password         => hiera('nodepool_hpcloud_password'),
     hpcloud_project          => hiera('nodepool_hpcloud_project'),
-    gearman_server           => 'zuul-dev.openstack.org',
   }
 }
 

modules/jenkins/manifests/master.pp

@@ -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',

modules/jenkins/templates/gearman-plugin.xml.erb

@@ -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>

modules/openstack_project/manifests/jenkins.pp

@@ -10,8 +10,7 @@ class openstack_project::jenkins (
   $ssl_chain_file_contents = '',
   $jenkins_ssh_private_key = '',
   $zmq_event_receivers = [],
-  $sysadmins = [],
+  $sysadmins = []
-  $gearman_server = '127.0.0.1',
 ) {
   include openstack_project
 
@@ -41,7 +40,6 @@ class openstack_project::jenkins (
     ssl_chain_file_contents => $ssl_chain_file_contents,
     jenkins_ssh_private_key => $jenkins_ssh_private_key,
     jenkins_ssh_public_key  => $openstack_project::jenkins_ssh_key,
-    gearman_server          => $gearman_server,
   }
 
   jenkins::plugin { 'ansicolor':
@@ -63,7 +61,7 @@ class openstack_project::jenkins (
     version => '1.70',
   }
   jenkins::plugin { 'gearman-plugin':
-    version => '0.0.6',
+    version => '0.0.3',
   }
   jenkins::plugin { 'git':
     version => '1.1.23',

modules/openstack_project/manifests/jenkins_dev.pp

@@ -12,7 +12,6 @@ class openstack_project::jenkins_dev (
   $hpcloud_username ='',
   $hpcloud_password ='',
   $hpcloud_project ='',
-  $gearman_server = '127.0.0.1',
 ) {
   include openstack_project
 
@@ -34,7 +33,6 @@ class openstack_project::jenkins_dev (
     ssl_chain_file          => '',
     jenkins_ssh_private_key => $jenkins_ssh_private_key,
     jenkins_ssh_public_key  => $openstack_project::jenkins_dev_ssh_key,
-    gearman_server          => $gearman_server,
   }
 
   file { '/etc/default/jenkins':