a86df2042c
When mysql-proxy was being used we had to open port 4040 to allow connections to the proxy. However, since that approach was abandoned and simpleproxy is being used instead, it's just forwarding port 3306. This commit fixes it by switch 4040 to 3306 in the firewall rules. Change-Id: Ie6d04e20996ba4c7f567526a2428ce5015b8b135
62 lines
2.0 KiB
Puppet
62 lines
2.0 KiB
Puppet
# Copyright 2013 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# 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.
|
|
#
|
|
# Logstash web frontend glue class.
|
|
#
|
|
class openstack_project::logstash (
|
|
$elasticsearch_nodes = [],
|
|
$gearman_workers = [],
|
|
$discover_nodes = ['elasticsearch01.openstack.org:9200'],
|
|
$statsd_host = 'graphite.openstack.org',
|
|
$sysadmins = [],
|
|
$subunit2sql_db_host,
|
|
$subunit2sql_db_pass,
|
|
) {
|
|
$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_rule = flatten([$iptables_es_rule, $iptables_gm_rule])
|
|
class { 'openstack_project::server':
|
|
iptables_public_tcp_ports => [22, 80, 3306],
|
|
iptables_rules6 => $iptables_rule,
|
|
iptables_rules4 => $iptables_rule,
|
|
sysadmins => $sysadmins,
|
|
}
|
|
|
|
class { 'logstash::web':
|
|
frontend => 'kibana',
|
|
discover_nodes => $discover_nodes,
|
|
proxy_elasticsearch => true,
|
|
}
|
|
|
|
class { 'log_processor': }
|
|
|
|
class { 'log_processor::client':
|
|
config_file => 'puppet:///modules/openstack_project/logstash/jenkins-log-client.yaml',
|
|
statsd_host => $statsd_host,
|
|
}
|
|
|
|
include 'subunit2sql'
|
|
|
|
class { 'subunit2sql::server':
|
|
db_host => $subunit2sql_db_host,
|
|
db_pass => $subunit2sql_db_pass,
|
|
}
|
|
|
|
include 'mysql_proxy'
|
|
|
|
class { 'mysql_proxy::server':
|
|
db_host => $subunit2sql_db_host,
|
|
}
|
|
}
|