opendev/system-config
Code Issues Proposed changes

Merge "Move out server class from elasticsearch_node.pp"

Browse Source
This commit is contained in:
Jenkins 2015-10-24 23:46:09 +00:00 committed by Gerrit Code Review
commit 2966b2e221
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/site.pp
View File

@ -461,10 +461,18 @@ node /^subunit-worker\d+\.openstack\.org$/ {
# Node-OS: precise # Node-OS: precise
node /^elasticsearch0[1-7]\.openstack\.org$/ { node /^elasticsearch0[1-7]\.openstack\.org$/ {
$group = "elasticsearch" $group = "elasticsearch"
$iptables_nodes_rule = regsubst ($elasticsearch_nodes,
'^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')
$iptables_clients_rule = regsubst ($elasticsearch_clients,
'^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')
$iptables_rule = flatten([$iptables_nodes_rule, $iptables_clients_rule])
class { 'openstack_project::server':
iptables_public_tcp_ports => [22],
iptables_rules6 => $iptables_rule,
iptables_rules4 => $iptables_rule,
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::elasticsearch_node': class { 'openstack_project::elasticsearch_node':
sysadmins => hiera('sysadmins', []),
elasticsearch_nodes => $elasticsearch_nodes,
elasticsearch_clients => $elasticsearch_clients,
discover_nodes => $elasticsearch_nodes, discover_nodes => $elasticsearch_nodes,
} }
} }

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

@ -15,22 +15,9 @@
# Elasticsearch server glue class. # Elasticsearch server glue class.
# #
class openstack_project::elasticsearch_node ( class openstack_project::elasticsearch_node (
$elasticsearch_nodes = [],
$elasticsearch_clients = [],
$discover_nodes = ['localhost'], $discover_nodes = ['localhost'],
$heap_size = '30g', $heap_size = '30g',
$sysadmins = []
) { ) {
$iptables_nodes_rule = regsubst ($elasticsearch_nodes, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')
$iptables_clients_rule = regsubst ($elasticsearch_clients, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')
$iptables_rule = flatten([$iptables_nodes_rule, $iptables_clients_rule])
class { 'openstack_project::server':
iptables_public_tcp_ports => [22],
iptables_rules6 => $iptables_rule,
iptables_rules4 => $iptables_rule,
sysadmins => $sysadmins,
}
class { 'logstash::elasticsearch': } class { 'logstash::elasticsearch': }
class { '::elasticsearch': class { '::elasticsearch':