opendev/system-config
Code Issues Proposed changes

Break out openstack_project::server from zuul_dev.pp

Browse Source 
Change-Id: I255decdcc4ef4ca460248090bc9f52613248b065
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-02-07 14:41:18 -05:00
parent 79523f0204
commit f13efacb5f
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/site.pp
View File

@ -1122,6 +1122,16 @@ node /^zm\d+\.openstack\.org$/ {
# Node-OS: trusty # Node-OS: trusty
node 'zuul-dev.openstack.org' { node 'zuul-dev.openstack.org' {
$gearman_workers = []
$iptables_rules = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
iptables_rules6 => $iptables_rules,
iptables_rules4 => $iptables_rules,
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::zuul_dev': class { 'openstack_project::zuul_dev':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
gerrit_server => 'review-dev.openstack.org', gerrit_server => 'review-dev.openstack.org',
@ -1130,9 +1140,7 @@ node 'zuul-dev.openstack.org' {
zuul_ssh_private_key => hiera('zuul_dev_ssh_private_key_contents'), zuul_ssh_private_key => hiera('zuul_dev_ssh_private_key_contents'),
url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}', url_pattern => 'http://logs.openstack.org/{build.parameters[LOG_PATH]}',
zuul_url => 'http://zuul-dev.openstack.org/p', zuul_url => 'http://zuul-dev.openstack.org/p',
sysadmins => hiera('sysadmins', []),
statsd_host => 'graphite.openstack.org', statsd_host => 'graphite.openstack.org',
gearman_workers => [],
} }
} }

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

@ -10,9 +10,7 @@ class openstack_project::zuul_dev(
$url_pattern = '', $url_pattern = '',
$status_url = 'http://zuul-dev.openstack.org', $status_url = 'http://zuul-dev.openstack.org',
$zuul_url = '', $zuul_url = '',
$sysadmins = [],
$statsd_host = '', $statsd_host = '',
$gearman_workers = [],
$project_config_repo = '', $project_config_repo = '',
) { ) {
@ -20,16 +18,6 @@ class openstack_project::zuul_dev(
User::Virtual::Localuser['zaro'], User::Virtual::Localuser['zaro'],
) )
# 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')
class { 'openstack_project::server':
iptables_public_tcp_ports => [80],
iptables_rules6 => $iptables_rules,
iptables_rules4 => $iptables_rules,
sysadmins => $sysadmins,
}
class { 'openstackci::zuul_scheduler': class { 'openstackci::zuul_scheduler':
vhost_name => $vhost_name, vhost_name => $vhost_name,
gearman_server => $gearman_server, gearman_server => $gearman_server,