opendev/system-config
Code Issues Proposed changes

Break out openstack_project::server from zuul_merger.pp

Browse Source 
This should be setup in site.pp, like all our other nodes.

Change-Id: I790f59d870ac70340bc43b9ebf53f6ce93fd5f46
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-02-07 14:22:32 -05:00
parent 2a6d361d81
commit 79523f0204
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -1106,13 +1106,17 @@ node /^zl\d+\.openstack\.org$/ {
# Node-OS: trusty # Node-OS: trusty
node /^zm\d+\.openstack\.org$/ { node /^zm\d+\.openstack\.org$/ {
$group = "zuul-merger" $group = "zuul-merger"
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::zuul_merger': class { 'openstack_project::zuul_merger':
gearman_server => 'zuul.openstack.org', gearman_server => 'zuul.openstack.org',
gerrit_server => 'review.openstack.org', gerrit_server => 'review.openstack.org',
gerrit_user => 'jenkins', gerrit_user => 'jenkins',
gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'), gerrit_ssh_host_key => hiera('gerrit_ssh_rsa_pubkey_contents'),
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
sysadmins => hiera('sysadmins', []),
} }
} }

7
modules/openstack_project/manifests/zuul_merger.pp
View File

@ -8,16 +8,9 @@ class openstack_project::zuul_merger(
$gerrit_ssh_host_key = '', $gerrit_ssh_host_key = '',
$zuul_ssh_private_key = '', $zuul_ssh_private_key = '',
$zuul_url = "http://${::fqdn}/p", $zuul_url = "http://${::fqdn}/p",
$sysadmins = [],
$git_email = 'jenkins@openstack.org', $git_email = 'jenkins@openstack.org',
$git_name = 'OpenStack Jenkins', $git_name = 'OpenStack Jenkins',
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
sysadmins => $sysadmins,
}
class { 'openstackci::zuul_merger': class { 'openstackci::zuul_merger':
vhost_name => $vhost_name, vhost_name => $vhost_name,
gearman_server => $gearman_server, gearman_server => $gearman_server,