Have Zuul replicate to git.o.o

Change-Id: I750e8ea75181dacb10275a38fa702ed1edb56d4c
This commit is contained in:
James E. Blair 2014-01-08 12:07:10 +08:00
parent 09b1e91b63
commit 2866945db2
4 changed files with 29 additions and 3 deletions

View File

@ -458,7 +458,24 @@ node 'zuul.openstack.org' {
'jenkins04.openstack.org', 'jenkins04.openstack.org',
'jenkins-dev.openstack.org', 'jenkins-dev.openstack.org',
], ],
} replication_targets => [
{
name => 'git01',
url => 'ssh://zuul@git01.openstack.org:/var/lib/git/zuul',
},
{
name => 'git02',
url => 'ssh://zuul@git02.openstack.org:/var/lib/git/zuul',
},
{
name => 'git03',
url => 'ssh://zuul@git03.openstack.org:/var/lib/git/zuul',
},
{
name => 'git04',
url => 'ssh://zuul@git04.openstack.org:/var/lib/git/zuul',
},
]
} }
node 'zuul-dev.openstack.org' { node 'zuul-dev.openstack.org' {

View File

@ -9,7 +9,8 @@ class openstack_project::zuul_prod(
$zuul_url = '', $zuul_url = '',
$sysadmins = [], $sysadmins = [],
$statsd_host = '', $statsd_host = '',
$gearman_workers = [] $gearman_workers = [],
$replication_targets = []
) { ) {
# Turn a list of hostnames into a list of iptables rules # Turn a list of hostnames into a list of iptables rules
$iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT') $iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
@ -32,6 +33,7 @@ class openstack_project::zuul_prod(
job_name_in_report => true, job_name_in_report => true,
status_url => 'http://status.openstack.org/zuul/', status_url => 'http://status.openstack.org/zuul/',
statsd_host => $statsd_host, statsd_host => $statsd_host,
replication_targets => $replication_targets,
} }
file { '/etc/zuul/layout.yaml': file { '/etc/zuul/layout.yaml':

View File

@ -32,7 +32,8 @@ class zuul (
$push_change_refs = false, $push_change_refs = false,
$job_name_in_report = false, $job_name_in_report = false,
$revision = 'master', $revision = 'master',
$statsd_host = '' $statsd_host = '',
$replication_targets = []
) { ) {
include apache include apache
include pip include pip

View File

@ -20,3 +20,9 @@ url_pattern=<%= url_pattern %>
status_url=<%= status_url %> status_url=<%= status_url %>
job_name_in_report=<%= job_name_in_report %> job_name_in_report=<%= job_name_in_report %>
zuul_url=<%= zuul_url %> zuul_url=<%= zuul_url %>
<% if replication_targets != [] -%>
[replication]
<% replication_targets.each do |target| -%>
<%= target['name'] %>=<%= target['url'] %>
<% end -%>