Merge "Install and run elasticsearch on new workers"

This commit is contained in:
Jenkins 2014-02-25 19:34:37 +00:00 committed by Gerrit Code Review
commit a31b9f1c53

View File

@ -337,6 +337,12 @@ $elasticsearch_nodes = [
'elasticsearch4.openstack.org',
'elasticsearch5.openstack.org',
'elasticsearch6.openstack.org',
'elasticsearch01.openstack.org',
'elasticsearch02.openstack.org',
'elasticsearch03.openstack.org',
'elasticsearch04.openstack.org',
'elasticsearch05.openstack.org',
'elasticsearch06.openstack.org',
]
node 'logstash.openstack.org' {
@ -368,6 +374,12 @@ node 'logstash.openstack.org' {
'elasticsearch4.openstack.org:9200',
'elasticsearch5.openstack.org:9200',
'elasticsearch6.openstack.org:9200',
'elasticsearch01.openstack.org:9200',
'elasticsearch02.openstack.org:9200',
'elasticsearch03.openstack.org:9200',
'elasticsearch04.openstack.org:9200',
'elasticsearch05.openstack.org:9200',
'elasticsearch06.openstack.org:9200',
],
}
}
@ -409,9 +421,29 @@ node /^elasticsearch\d?\.openstack\.org$/ {
}
node /^elasticsearch\d\d\.openstack\.org$/ {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22],
sysadmins => hiera('sysadmins'),
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,
}
}