opendev/system-config
Code Issues Proposed changes

Merge "Cleanup elasticsearch related config"

Browse Source
This commit is contained in:
Jenkins 2014-08-12 19:31:49 +00:00 committed by Gerrit Code Review
commit 187f7d38c6
2 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
manifests/site.pp
View File

@ -6,7 +6,6 @@
# passed around in test.sh # passed around in test.sh
# #
$elasticsearch_nodes = [ $elasticsearch_nodes = [
'elasticsearch01.openstack.org',
'elasticsearch02.openstack.org', 'elasticsearch02.openstack.org',
'elasticsearch03.openstack.org', 'elasticsearch03.openstack.org',
'elasticsearch04.openstack.org', 'elasticsearch04.openstack.org',
@ -14,6 +13,29 @@ $elasticsearch_nodes = [
'elasticsearch06.openstack.org', 'elasticsearch06.openstack.org',
'elasticsearch07.openstack.org', 'elasticsearch07.openstack.org',
] ]
$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',
'logstash-worker17.openstack.org',
'logstash-worker18.openstack.org',
'logstash-worker19.openstack.org',
'logstash-worker20.openstack.org',
]
# #
# Default: should at least behave like an openstack server # Default: should at least behave like an openstack server
@ -290,31 +312,10 @@ node 'wiki.openstack.org' {
# Node-OS: precise # Node-OS: precise
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_nodes,
gearman_workers => [ gearman_workers => $elasticsearch_clients,
'logstash-worker01.openstack.org', discover_nodes => [
'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',
'logstash-worker17.openstack.org',
'logstash-worker18.openstack.org',
'logstash-worker19.openstack.org',
'logstash-worker20.openstack.org',
],
discover_nodes => [
'elasticsearch02.openstack.org:9200', 'elasticsearch02.openstack.org:9200',
'elasticsearch03.openstack.org:9200', 'elasticsearch03.openstack.org:9200',
'elasticsearch04.openstack.org:9200', 'elasticsearch04.openstack.org:9200',
@ -328,9 +329,10 @@ node 'logstash.openstack.org' {
# Node-OS: precise # Node-OS: precise
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_nodes,
discover_node => 'elasticsearch02.openstack.org', elasticsearch_clients => $elasticsearch_clients,
discover_node => 'elasticsearch02.openstack.org',
} }
} }
@ -339,29 +341,7 @@ node /^elasticsearch0[1-7]\.openstack\.org$/ {
class { 'openstack_project::elasticsearch_node': class { 'openstack_project::elasticsearch_node':
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
elasticsearch_nodes => $elasticsearch_nodes, elasticsearch_nodes => $elasticsearch_nodes,
elasticsearch_clients => [ elasticsearch_clients => $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',
'logstash-worker17.openstack.org',
'logstash-worker18.openstack.org',
'logstash-worker19.openstack.org',
'logstash-worker20.openstack.org',
],
discover_nodes => $elasticsearch_nodes, discover_nodes => $elasticsearch_nodes,
} }
} }

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

@ -16,10 +16,11 @@
# #
class openstack_project::logstash_worker ( class openstack_project::logstash_worker (
$elasticsearch_nodes = [], $elasticsearch_nodes = [],
$elasticsearch_clients = [],
$discover_node = 'elasticsearch01.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 (flatten([$elasticsearch_nodes, $elasticsearch_clients]) , '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT')
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [22], iptables_public_tcp_ports => [22],
iptables_rules6 => $iptables_rule, iptables_rules6 => $iptables_rule,