opendev/system-config
Code Issues Proposed changes

Moved the server class out from the logstash and logstash_worker class

Browse Source 
Change-Id: I96df327f278714fb393dca887b8db1e01ca7504d
Story: 2000172
Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html
This commit is contained in:
George Peristerakis 2015-05-22 11:41:31 -04:00
parent a88ebb863f
commit 6000c580ab
3 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
manifests/site.pp
View File

@ -315,11 +315,21 @@ node 'wiki.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'logstash.openstack.org' { node 'logstash.openstack.org' {
$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($elasticsearch_clients,
'^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT')
$logstash_iptables_rule = flatten([$iptables_es_rule, $iptables_gm_rule])
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 3306],
iptables_rules6 => $logstash_iptables_rule,
iptables_rules4 => $logstash_iptables_rule,
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::logstash': class { 'openstack_project::logstash':
sysadmins => hiera('sysadmins', []), discover_nodes => [
elasticsearch_nodes => $elasticsearch_nodes,
gearman_workers => $elasticsearch_clients,
discover_nodes => [
'elasticsearch02.openstack.org:9200', 'elasticsearch02.openstack.org:9200',
'elasticsearch03.openstack.org:9200', 'elasticsearch03.openstack.org:9200',
'elasticsearch04.openstack.org:9200', 'elasticsearch04.openstack.org:9200',
@ -327,18 +337,25 @@ node 'logstash.openstack.org' {
'elasticsearch06.openstack.org:9200', 'elasticsearch06.openstack.org:9200',
'elasticsearch07.openstack.org:9200', 'elasticsearch07.openstack.org:9200',
], ],
subunit2sql_db_host => hiera('subunit2sql_db_host', ''), subunit2sql_db_host => hiera('subunit2sql_db_host', ''),
subunit2sql_db_pass => hiera('subunit2sql_db_password', ''), subunit2sql_db_pass => hiera('subunit2sql_db_password', ''),
} }
} }
# Node-OS: precise # Node-OS: precise
node /^logstash-worker\d+\.openstack\.org$/ { node /^logstash-worker\d+\.openstack\.org$/ {
$group = "logstash-worker" $logstash_worker_iptables_rule = regsubst(flatten([$elasticsearch_nodes, $elasticsearch_clients]),
'^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')
$group = 'logstash-worker'
class { 'openstack_project::server':
iptables_public_tcp_ports => [22],
iptables_rules6 => $logstash_worker_iptables_rule,
iptables_rules4 => $logstash_worker_iptables_rule,
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::logstash_worker': class { 'openstack_project::logstash_worker':
sysadmins => hiera('sysadmins', []),
elasticsearch_nodes => $elasticsearch_nodes,
elasticsearch_clients => $elasticsearch_clients,
discover_node => 'elasticsearch02.openstack.org', discover_node => 'elasticsearch02.openstack.org',
} }
} }
@ -347,7 +364,7 @@ node /^logstash-worker\d+\.openstack\.org$/ {
node /^subunit-worker\d+\.openstack\.org$/ { node /^subunit-worker\d+\.openstack\.org$/ {
$group = "subunit-worker" $group = "subunit-worker"
class { 'openstack_project::subunit_worker': class { 'openstack_project::subunit_worker':
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
subunit2sql_db_host => hiera('subunit2sql_db_host', ''), subunit2sql_db_host => hiera('subunit2sql_db_host', ''),
subunit2sql_db_pass => hiera('subunit2sql_db_password', ''), subunit2sql_db_pass => hiera('subunit2sql_db_password', ''),
} }

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

@ -15,24 +15,11 @@
# Logstash web frontend glue class. # Logstash web frontend glue class.
# #
class openstack_project::logstash ( class openstack_project::logstash (
$elasticsearch_nodes = [],
$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 = [],
$subunit2sql_db_host, $subunit2sql_db_host,
$subunit2sql_db_pass, $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': class { 'logstash::web':
frontend => 'kibana', frontend => 'kibana',
discover_nodes => $discover_nodes, discover_nodes => $discover_nodes,

11
modules/openstack_project/manifests/logstash_worker.pp
View File

@ -15,19 +15,8 @@
# Logstash indexer worker glue class. # Logstash indexer worker glue class.
# #
class openstack_project::logstash_worker ( class openstack_project::logstash_worker (
$elasticsearch_nodes = [],
$elasticsearch_clients = [],
$discover_node = 'elasticsearch01.openstack.org', $discover_node = 'elasticsearch01.openstack.org',
$sysadmins = []
) { ) {
$iptables_rule = regsubst (flatten([$elasticsearch_nodes, $elasticsearch_clients]) , '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')
class { 'openstack_project::server':
iptables_public_tcp_ports => [22],
iptables_rules6 => $iptables_rule,
iptables_rules4 => $iptables_rule,
sysadmins => $sysadmins,
}
file { '/etc/default/logstash-indexer': file { '/etc/default/logstash-indexer':
ensure => present, ensure => present,
owner => 'root', owner => 'root',