From e775582e056dedffe7a1490a13d070cc26669f9b Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 5 Apr 2013 13:48:11 -0700 Subject: [PATCH] Fix gearman installation. 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 Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- manifests/site.pp | 5 ----- modules/openstack_project/manifests/zuul.pp | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index a96909f713..09cffb88ad 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -234,11 +234,6 @@ node 'zuul.openstack.org' { 'jenkins-dev.openstack.org', ], } - # co-host gearman-job-server - include gearman - class { 'gearman': - listen => '::', - } } # A bare machine, but with a jenkins user diff --git a/modules/openstack_project/manifests/zuul.pp b/modules/openstack_project/manifests/zuul.pp index d17b82321b..b2f71ee891 100644 --- a/modules/openstack_project/manifests/zuul.pp +++ b/modules/openstack_project/manifests/zuul.pp @@ -26,6 +26,11 @@ class openstack_project::zuul( sysadmins => $sysadmins, } + # co-host gearman-job-server + class { 'gearman': + listen => '::', + } + class { '::zuul': vhost_name => $vhost_name, jenkins_server => $jenkins_url,