opendev/system-config
Code Issues Proposed changes

Merge "Switch zm[1-4].o.o to zuulv3"

Browse Source
This commit is contained in:
Zuul 2017-10-26 01:20:46 +00:00 committed by Gerrit Code Review
commit 68b6812595
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
manifests/site.pp
View File

@ -1302,6 +1302,10 @@ node 'zuulv3.openstack.org' {
'ze08.openstack.org', 'ze08.openstack.org',
'ze09.openstack.org', 'ze09.openstack.org',
'ze10.openstack.org', 'ze10.openstack.org',
'zm01.openstack.org',
'zm02.openstack.org',
'zm03.openstack.org',
'zm04.openstack.org',
'zm05.openstack.org', 'zm05.openstack.org',
'zm06.openstack.org', 'zm06.openstack.org',
'zm07.openstack.org', 'zm07.openstack.org',
@ -1376,10 +1380,6 @@ node 'zuul.openstack.org' {
'zl04.openstack.org', 'zl04.openstack.org',
'zl05.openstack.org', 'zl05.openstack.org',
'zl06.openstack.org', 'zl06.openstack.org',
'zm01.openstack.org',
'zm02.openstack.org',
'zm03.openstack.org',
'zm04.openstack.org',
] ]
$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')
@ -1460,25 +1460,8 @@ node /^zl\d+\.openstack\.org$/ {
} }
} }
# Node-OS: trusty
node /^zm0[1234].openstack\.org$/ {
$group = "zuul-merger"
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::zuul_merger':
gearman_server => 'zuul.openstack.org',
gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins',
gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'),
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
}
}
# Node-OS: xenial # Node-OS: xenial
node /^zm0[5678].openstack\.org$/ { node /^zm\d+.openstack\.org$/ {
$group = "zuul-merger" $group = "zuul-merger"
$gerrit_server = 'review.openstack.org' $gerrit_server = 'review.openstack.org'