Merge "Rename openstack_project::elasticsearch"

This commit is contained in:
Jenkins 2013-10-18 23:41:06 +00:00 committed by Gerrit Code Review
commit 5a463e3c8e
2 changed files with 2 additions and 2 deletions

View File

@ -296,7 +296,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_node':
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
elasticsearch_nodes => $elasticsearch_nodes, elasticsearch_nodes => $elasticsearch_nodes,
elasticsearch_clients => [ elasticsearch_clients => [

View File

@ -14,7 +14,7 @@
# #
# Elasticsearch server glue class. # Elasticsearch server glue class.
# #
class openstack_project::elasticsearch ( class openstack_project::elasticsearch_node (
$elasticsearch_nodes = [], $elasticsearch_nodes = [],
$elasticsearch_clients = [], $elasticsearch_clients = [],
$discover_nodes = ['localhost'], $discover_nodes = ['localhost'],