opendev/system-config
Code Issues Proposed changes

Merge "Move primary elasticsearch discover node"

Browse Source
This commit is contained in:
Jenkins 2014-02-27 18:06:16 +00:00 committed by Gerrit Code Review
commit 8e82596ab1
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/site.pp
View File

@ -331,18 +331,18 @@ node 'puppet-dashboard.openstack.org' {
} }
$elasticsearch_nodes = [ $elasticsearch_nodes = [
'elasticsearch.openstack.org',
'elasticsearch2.openstack.org',
'elasticsearch3.openstack.org',
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
'elasticsearch6.openstack.org',
'elasticsearch01.openstack.org', 'elasticsearch01.openstack.org',
'elasticsearch02.openstack.org', 'elasticsearch02.openstack.org',
'elasticsearch03.openstack.org', 'elasticsearch03.openstack.org',
'elasticsearch04.openstack.org', 'elasticsearch04.openstack.org',
'elasticsearch05.openstack.org', 'elasticsearch05.openstack.org',
'elasticsearch06.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' { node 'logstash.openstack.org' {
@ -382,7 +382,7 @@ 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_nodes,
discover_node => 'elasticsearch.openstack.org', discover_node => 'elasticsearch01.openstack.org',
} }
} }

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

@ -17,7 +17,7 @@
class openstack_project::logstash ( class openstack_project::logstash (
$elasticsearch_nodes = [], $elasticsearch_nodes = [],
$gearman_workers = [], $gearman_workers = [],
$discover_nodes = ['elasticsearch.openstack.org:9200'], $discover_nodes = ['elasticsearch01.openstack.org:9200'],
$statsd_host = 'graphite.openstack.org', $statsd_host = 'graphite.openstack.org',
$sysadmins = [] $sysadmins = []
) { ) {

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

@ -16,7 +16,7 @@
# #
class openstack_project::logstash_worker ( class openstack_project::logstash_worker (
$elasticsearch_nodes = [], $elasticsearch_nodes = [],
$discover_node = 'elasticsearch.openstack.org', $discover_node = 'elasticsearch01.openstack.org',
$sysadmins = [] $sysadmins = []
) { ) {
$iptables_rule = regsubst ($elasticsearch_nodes, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT') $iptables_rule = regsubst ($elasticsearch_nodes, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')