opendev
/
system-config
Code Issues Proposed changes

Merge "Make the zm.. host entries a regex"

This commit is contained in:
Jenkins 2014-10-20 18:14:23 +00:00 committed by Gerrit Code Review
parent 9a2ff48287 705d7747bd
commit 7daa67b184
1 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
manifests/site.pp
View File

@ -508,43 +508,7 @@ node 'zuul.openstack.org' {
}
# Node-OS: precise
node 'zm01.openstack.org' {
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', 'XXX'),
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents', 'XXX'),
sysadmins => hiera('sysadmins', []),
}
}
# Node-OS: precise
node 'zm02.openstack.org' {
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', 'XXX'),
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents', 'XXX'),
sysadmins => hiera('sysadmins', []),
}
}
# Node-OS: precise
node 'zm03.openstack.org' {
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', 'XXX'),
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents', 'XXX'),
sysadmins => hiera('sysadmins', []),
}
}
# Node-OS: precise
node 'zm04.openstack.org' {
node /^zm\d+\.openstack\.org$/ {
class { 'openstack_project::zuul_merger':
gearman_server => 'zuul.openstack.org',
gerrit_server => 'review.openstack.org',