opendev/system-config
Code Issues Proposed changes

Revert "Connectivity from workers to gearmand on zuul."

Browse Source 
This reverts commit f61a6e53dd3633346257f4d1c1b23cc661e057f5.

Change-Id: I8c94cdeff5bdef2160ce74ff2c1170ea0c25ae3b
Reviewed-on: https://review.openstack.org/26183
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2013-04-05 02:16:24 +00:00 committed by Jenkins
parent b81fc4bf50
commit 7188fd57bc
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -229,16 +229,9 @@ node 'zuul.openstack.org' {
url_pattern => 'http://logs.openstack.org/{change.number}/{change.patchset}/{pipeline.name}/{job.name}/{build.number}',
sysadmins => hiera('sysadmins'),
statsd_host => 'graphite.openstack.org',
gearman_workers => [
'jenkins.openstack.org',
'jenkins-dev.openstack.org',
],
}
# co-host gearman-job-server
include gearman
class { 'gearman':
listen => '::',
}
}
# A bare machine, but with a jenkins user

2
modules/openstack_project/manifests/jenkins.pp
View File

@ -9,7 +9,7 @@ class openstack_project::jenkins (
$sysadmins = []
) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443],
iptables_public_tcp_ports => [80, 443, 4155],
sysadmins => $sysadmins,
}

2
modules/openstack_project/manifests/jenkins_dev.pp
View File

@ -4,7 +4,7 @@ class openstack_project::jenkins_dev (
$sysadmins = []
) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443],
iptables_public_tcp_ports => [80, 443, 4155],
sysadmins => $sysadmins,
}
include bup

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

@ -11,20 +11,14 @@ class openstack_project::zuul(
$zuul_ssh_private_key = '',
$url_pattern = '',
$sysadmins = [],
$statsd_host = '',
$gearman_workers = []
$statsd_host = ''
) {
# Turn a list of hostnames into a list of iptables rules
$iptables_rules6 = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
$iptables_rules4 = $iptables_rules6
$iptables_rules4 += [ "-m state --state NEW -m tcp -p tcp --dport 8001 -s ${jenkins_host} -j ACCEPT" ]
$rules = [ "-m state --state NEW -m tcp -p tcp --dport 8001 -s ${jenkins_host} -j ACCEPT" ]
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
iptables_rules6 => $iptables_rules6,
iptables_rules4 => $iptables_rules4,
iptables_rules4 => $rules,
sysadmins => $sysadmins,
}