opendev/system-config
Code Issues Proposed changes

Merge "Remove old elasticsearch cluster members"

Browse Source
This commit is contained in:
Jenkins 2014-03-04 18:45:24 +00:00 committed by Gerrit Code Review
commit a7f233bc53
2 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/site.pp
View File

@ -337,12 +337,6 @@ $elasticsearch_nodes = [
'elasticsearch04.openstack.org',
'elasticsearch05.openstack.org',
'elasticsearch06.openstack.org',
'elasticsearch.openstack.org',
'elasticsearch2.openstack.org',
'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
'elasticsearch6.openstack.org',
]
node 'logstash.openstack.org' {
@ -386,35 +380,7 @@ node /^logstash-worker\d+\.openstack\.org$/ {
}
}
node /^elasticsearch\d?\.openstack\.org$/ {
class { 'openstack_project::elasticsearch_node':
sysadmins => hiera('sysadmins'),
elasticsearch_nodes => $elasticsearch_nodes,
elasticsearch_clients => [
'logstash.openstack.org',
'logstash-worker01.openstack.org',
'logstash-worker02.openstack.org',
'logstash-worker03.openstack.org',
'logstash-worker04.openstack.org',
'logstash-worker05.openstack.org',
'logstash-worker06.openstack.org',
'logstash-worker07.openstack.org',
'logstash-worker08.openstack.org',
'logstash-worker09.openstack.org',
'logstash-worker10.openstack.org',
'logstash-worker11.openstack.org',
'logstash-worker12.openstack.org',
'logstash-worker13.openstack.org',
'logstash-worker14.openstack.org',
'logstash-worker15.openstack.org',
'logstash-worker16.openstack.org',
],
discover_nodes => $elasticsearch_nodes,
heap_size => '16g',
}
}
node /^elasticsearch\d\d\.openstack\.org$/ {
node /^elasticsearch\d+\.openstack\.org$/ {
class { 'openstack_project::elasticsearch_node':
sysadmins => hiera('sysadmins'),
elasticsearch_nodes => $elasticsearch_nodes,

6
modules/openstack_project/manifests/cacti.pp
View File

@ -72,12 +72,6 @@ class openstack_project::cacti (
#'community.openstack.org',
'ci-puppetmaster.openstack.org',
'eavesdrop.openstack.org',
'elasticsearch.openstack.org',
'elasticsearch2.openstack.org',
'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
'elasticsearch6.openstack.org',
'elasticsearch01.openstack.org',
'elasticsearch02.openstack.org',
'elasticsearch03.openstack.org',