opendev/system-config
Code Issues Proposed changes

Merge "Add sixth elasticsearch node."

Browse Source
This commit is contained in:
Jenkins 2013-08-03 03:13:43 +00:00 committed by Gerrit Code Review
commit 7e5901a397
3 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
manifests/site.pp
View File

@ -224,16 +224,19 @@ node 'puppet-dashboard.openstack.org' {
} }
} }
$elasticsearch_nodes = [
'elasticsearch.openstack.org',
'elasticsearch2.openstack.org',
'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
'elasticsearch6.openstack.org',
]
node 'logstash.openstack.org' { node 'logstash.openstack.org' {
class { 'openstack_project::logstash': class { 'openstack_project::logstash':
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
elasticsearch_nodes => [ elasticsearch_nodes => $elasticsearch_nodes,
'elasticsearch.openstack.org',
'elasticsearch2.openstack.org',
'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
],
gearman_workers => [ gearman_workers => [
'logstash-worker1.openstack.org', 'logstash-worker1.openstack.org',
'logstash-worker2.openstack.org', 'logstash-worker2.openstack.org',
@ -244,26 +247,14 @@ node 'logstash.openstack.org' {
'logstash-worker7.openstack.org', 'logstash-worker7.openstack.org',
'logstash-worker8.openstack.org', 'logstash-worker8.openstack.org',
], ],
discover_nodes => [ discover_nodes => $elasticsearch_nodes,
'elasticsearch.openstack.org:9200',
'elasticsearch2.openstack.org:9200',
'elasticsearch3.openstack.org:9200',
'elasticsearch4.openstack.org:9200',
'elasticsearch5.openstack.org:9200',
],
} }
} }
node /^logstash-worker\d+\.openstack\.org$/ { node /^logstash-worker\d+\.openstack\.org$/ {
class { 'openstack_project::logstash_worker': class { 'openstack_project::logstash_worker':
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
elasticsearch_nodes => [ elasticsearch_nodes => $elasticsearch_nodes,
'elasticsearch.openstack.org',
'elasticsearch2.openstack.org',
'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
],
discover_node => 'elasticsearch.openstack.org', discover_node => 'elasticsearch.openstack.org',
} }
} }
@ -271,13 +262,7 @@ node /^logstash-worker\d+\.openstack\.org$/ {
node /^elasticsearch\d*\.openstack\.org$/ { node /^elasticsearch\d*\.openstack\.org$/ {
class { 'openstack_project::elasticsearch': class { 'openstack_project::elasticsearch':
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
elasticsearch_nodes => [ elasticsearch_nodes => $elasticsearch_nodes,
'elasticsearch.openstack.org',
'elasticsearch2.openstack.org',
'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
],
elasticsearch_clients => [ elasticsearch_clients => [
'logstash.openstack.org', 'logstash.openstack.org',
'logstash-worker1.openstack.org', 'logstash-worker1.openstack.org',
@ -289,13 +274,7 @@ node /^elasticsearch\d*\.openstack\.org$/ {
'logstash-worker7.openstack.org', 'logstash-worker7.openstack.org',
'logstash-worker8.openstack.org', 'logstash-worker8.openstack.org',
], ],
discover_nodes => [ discover_nodes => $elasticsearch_nodes,
'elasticsearch.openstack.org',
'elasticsearch2.openstack.org',
'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
],
} }
} }

6
modules/logstash/templates/elasticsearch.yml.erb
View File

@ -255,7 +255,7 @@ bootstrap.mlockall: true
# Allow recovery process after N nodes in a cluster are up: # Allow recovery process after N nodes in a cluster are up:
# #
gateway.recover_after_nodes: 4 gateway.recover_after_nodes: 5
# Set the timeout to initiate the recovery process, once the N nodes # Set the timeout to initiate the recovery process, once the N nodes
# from previous setting are up (accepts time value): # from previous setting are up (accepts time value):
@ -266,7 +266,7 @@ gateway.recover_after_time: 5m
# are up (and recover_after_nodes is met), begin recovery process immediately # are up (and recover_after_nodes is met), begin recovery process immediately
# (without waiting for recover_after_time to expire): # (without waiting for recover_after_time to expire):
# #
gateway.expected_nodes: 5 gateway.expected_nodes: 6
############################# Recovery Throttling ############################# ############################# Recovery Throttling #############################
@ -304,7 +304,7 @@ gateway.expected_nodes: 5
# operational within the cluster. Set this option to a higher value (2-4) # operational within the cluster. Set this option to a higher value (2-4)
# for large clusters (>3 nodes): # for large clusters (>3 nodes):
# #
discovery.zen.minimum_master_nodes: 2 discovery.zen.minimum_master_nodes: 4
# Set the time to wait for ping responses from other nodes when discovering. # Set the time to wait for ping responses from other nodes when discovering.
# Set this option to a higher value on a slow or congested network # Set this option to a higher value on a slow or congested network

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

@ -64,6 +64,7 @@ class openstack_project::cacti (
'elasticsearch3.openstack.org', 'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org', 'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org', 'elasticsearch5.openstack.org',
'elasticsearch6.openstack.org',
'etherpad.openstack.org', 'etherpad.openstack.org',
'graphite.openstack.org', 'graphite.openstack.org',
'jenkins.openstack.org', 'jenkins.openstack.org',