opendev/system-config
Code Issues Proposed changes

Fix gearman installation.

Browse Source 
Remove 'include' gearman as it's redundant and results in:

  "Error 400 on SERVER: Duplicate declaration: Class[Gearman]
   is already declared;"

Also, move declaration to zuul manifest as it is part of the
configuration of the OpenStack zuul server.

Change-Id: I9acf0b0d5e6b8c83aca38aa6b201eddf6ea5f023
Reviewed-on: https://review.openstack.org/26264
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-04-05 13:48:11 -07:00 committed by Jenkins
parent f1461cac89
commit e775582e05
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/site.pp
View File

@ -234,11 +234,6 @@ node 'zuul.openstack.org' {
'jenkins-dev.openstack.org', 'jenkins-dev.openstack.org',
], ],
} }
# co-host gearman-job-server
include gearman
class { 'gearman':
listen => '::',
}
} }
# A bare machine, but with a jenkins user # A bare machine, but with a jenkins user

5
modules/openstack_project/manifests/zuul.pp
View File

@ -26,6 +26,11 @@ class openstack_project::zuul(
sysadmins => $sysadmins, sysadmins => $sysadmins,
} }
# co-host gearman-job-server
class { 'gearman':
listen => '::',
}
class { '::zuul': class { '::zuul':
vhost_name => $vhost_name, vhost_name => $vhost_name,
jenkins_server => $jenkins_url, jenkins_server => $jenkins_url,