opendev
/
system-config
Code Issues Proposed changes

Create new 30g heap elasticsearch workers 

Temporarily leave the old node names in place with an override to
16g heap size, but pass the openstack_project default of 30g into
the elasticsearch module as a new variable. Also don't actually
configure the new servers to install and run elasticsearch yet,
since there are manual steps needed to prep the additional block
devices on them.

Change-Id: I9fca2115c8996ae2f1a6c605bcdf16a8b6342a24
This commit is contained in:
Jeremy Stanley 2014-02-24 22:25:37 +00:00
parent 158cbf0e4e
commit cde1a4abee
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/site.pp
View File

@ -380,7 +380,7 @@ node /^logstash-worker\d+\.openstack\.org$/ {
}
}
node /^elasticsearch\d*\.openstack\.org$/ {
node /^elasticsearch\d?\.openstack\.org$/ {
class { 'openstack_project::elasticsearch_node':
sysadmins => hiera('sysadmins'),
elasticsearch_nodes => $elasticsearch_nodes,
@ -404,6 +404,14 @@ node /^elasticsearch\d*\.openstack\.org$/ {
'logstash-worker16.openstack.org',
],
discover_nodes => $elasticsearch_nodes,
heap_size => '16g',
}
}
node /^elasticsearch\d\d\.openstack\.org$/ {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22],
sysadmins => hiera('sysadmins'),
}
}

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

@ -18,6 +18,7 @@ class openstack_project::elasticsearch_node (
$elasticsearch_nodes = [],
$elasticsearch_clients = [],
$discover_nodes = ['localhost'],
$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')
@ -45,6 +46,7 @@ class openstack_project::elasticsearch_node (
'discovery.zen.ping.multicast.enabled' => false,
'discovery.zen.ping.unicast.hosts' => $discover_nodes,
},
heap_size => $heap_size,
version => '0.90.9',
}