opendev/system-config
Code Issues Proposed changes

Merge "Add subunit2sql server configuration"

Browse Source
This commit is contained in:
Jenkins 2014-11-07 15:50:08 +00:00 committed by Gerrit Code Review
commit 85f69c38d4
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openstack_project/manifests/logstash.pp
View File

@ -19,7 +19,8 @@ class openstack_project::logstash (
$gearman_workers = [], $gearman_workers = [],
$discover_nodes = ['elasticsearch01.openstack.org:9200'], $discover_nodes = ['elasticsearch01.openstack.org:9200'],
$statsd_host = 'graphite.openstack.org', $statsd_host = 'graphite.openstack.org',
$sysadmins = [] $sysadmins = [],
$subunit2sql_db_uri= ''
) { ) {
$iptables_es_rule = regsubst ($elasticsearch_nodes, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT') $iptables_es_rule = regsubst ($elasticsearch_nodes, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')
$iptables_gm_rule = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT') $iptables_gm_rule = regsubst ($gearman_workers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
@ -43,4 +44,10 @@ class openstack_project::logstash (
config_file => 'puppet:///modules/openstack_project/logstash/jenkins-log-client.yaml', config_file => 'puppet:///modules/openstack_project/logstash/jenkins-log-client.yaml',
statsd_host => $statsd_host, statsd_host => $statsd_host,
} }
include 'subunit2sql'
class { 'subunit2sql::server':
subunit2sql_db_uri => $subunit2sql_db_uri,
}
} }

35
modules/subunit2sql/manifests/server.pp Normal file
View File

@ -0,0 +1,35 @@
# Copyright 2012-2013 Hewlett-Packard Development Company, L.P.
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# == Class: subunit2sql
#
class subunit2sql::server (
$subunit2sql_db_uri,
) {
file { '/etc/subunit2sql.conf':
ensure => present,
owner => 'root',
group => 'root',
mode => '0555',
content => template('subunit2sql/subunit2sql.conf.erb'),
}
exec { 'upgrade_subunit2sql_db':
command => 'subunit2sql-db-manage --config-file /etc/subunit2sql.conf upgrade head',
path => '/usr/local/bin:/usr/bin:/bin/',
subscribe => Package['subunit2sql'],
}
}