Use Zuul's internal gearman server.

(This is only used by zuul-dev currently.)

Remove co-hosted gearmand server (will require manual cleanup).

Also, listen for feature/gearman events in openstack-infra.

Change-Id: I2dd58e62ff79277f1ef5c79da54bcc7511f2ccee
Reviewed-on: https://review.openstack.org/30175
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins

modules/gerritbot/files/gerritbot_channel_config.yaml

@@ -29,6 +29,7 @@ openstack-infra:
       - openstack/requirements
     branches:
       - master
+      - feature/gearman
 
 openstack-dev:
     events:

modules/openstack_project/files/zuul/gearman-logging.conf

@@ -0,0 +1,39 @@
+[loggers]
+keys=root,gear
+
+[handlers]
+keys=console,debug,normal
+
+[formatters]
+keys=simple
+
+[logger_root]
+level=WARNING
+handlers=console
+
+[logger_gear]
+level=DEBUG
+handlers=debug,normal
+qualname=gear
+
+[handler_console]
+level=WARNING
+class=StreamHandler
+formatter=simple
+args=(sys.stdout,)
+
+[handler_debug]
+level=DEBUG
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/zuul/gearman-server-debug.log', 'midnight', 1, 30,)
+
+[handler_normal]
+level=INFO
+class=logging.handlers.TimedRotatingFileHandler
+formatter=simple
+args=('/var/log/zuul/gearman-server.log', 'midnight', 1, 30,)
+
+[formatter_simple]
+format=%(asctime)s %(levelname)s %(name)s: %(message)s
+datefmt=

modules/openstack_project/files/zuul/logging.conf

@@ -1,5 +1,5 @@
 [loggers]
-keys=root,zuul,gerrit
+keys=root,zuul,gerrit,gear
 
 [handlers]
 keys=console,debug,normal
@@ -17,10 +17,15 @@ handlers=debug,normal
 qualname=zuul
 
 [logger_gerrit]
-level=DEBUG
+level=INFO
 handlers=debug,normal
 qualname=gerrit
 
+[logger_gear]
+level=DEBUG
+handlers=debug,normal
+qualname=gear
+
 [handler_console]
 level=WARNING
 class=StreamHandler

modules/openstack_project/manifests/zuul_dev.pp

@@ -24,11 +24,6 @@ class openstack_project::zuul_dev(
     sysadmins                 => $sysadmins,
   }
 
-  # co-host gearman-job-server
-  class { 'gearman':
-    listen => '::',
-  }
-
   class { '::zuul':
     vhost_name           => $vhost_name,
     gerrit_server        => $gerrit_server,
@@ -59,6 +54,12 @@ class openstack_project::zuul_dev(
     notify => Exec['zuul-reload'],
   }
 
+  file { '/etc/zuul/gearman-logging.conf':
+    ensure => present,
+    source => 'puppet:///modules/openstack_project/zuul/gearman-logging.conf',
+    notify => Exec['zuul-reload'],
+  }
+
   class { '::recheckwatch':
     gerrit_server                => $gerrit_server,
     gerrit_user                  => $gerrit_user,

modules/zuul/manifests/init.pp

@@ -21,6 +21,7 @@ class zuul (
   $vhost_name = $::fqdn,
   $serveradmin = "webmaster@${::fqdn}",
   $gearman_server = '127.0.0.1',
+  $internal_gearman = true,
   $jenkins_server = '',
   $jenkins_user = '',
   $jenkins_apikey = '',

modules/zuul/templates/zuul.conf.erb

@@ -1,6 +1,10 @@
 [gearman]
 server=<%= gearman_server %>
 
+[gearman_server]
+start=<%= internal_gearman %>
+log_config=/etc/zuul/gearman-logging.conf
+
 [jenkins]
 server=<%= jenkins_server %>
 user=<%= jenkins_user %>