opendev/system-config
Code Issues Proposed changes

Merge "Move out server class from subunit_worker.pp"

Browse Source
This commit is contained in:
Jenkins 2015-10-24 23:44:37 +00:00 committed by Gerrit Code Review
commit 6c0cbaeb8b
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/site.pp
View File

@ -448,8 +448,11 @@ node /^logstash-worker\d+\.openstack\.org$/ {
# Node-OS: trusty
node /^subunit-worker\d+\.openstack\.org$/ {
$group = "subunit-worker"
class { 'openstack_project::server':
iptables_public_tcp_ports => [22],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::subunit_worker':
sysadmins => hiera('sysadmins', []),
subunit2sql_db_host => hiera('subunit2sql_db_host', ''),
subunit2sql_db_pass => hiera('subunit2sql_db_password', ''),
}

6
modules/openstack_project/manifests/subunit_worker.pp
View File

@ -15,15 +15,9 @@
# subunit2sql worker glue class.
#
class openstack_project::subunit_worker (
$sysadmins = [],
$subunit2sql_db_host,
$subunit2sql_db_pass,
) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22],
sysadmins => $sysadmins,
}
include subunit2sql
subunit2sql::worker { 'A':
config_file => 'puppet:///modules/openstack_project/logstash/jenkins-subunit-worker.yaml',