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 <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:
parent
f1461cac89
commit
e775582e05
@ -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
|
||||
|
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user