opendev
/
puppet-elasticsearch
Code Issues Proposed changes

Merge "Fix variable access warnings"

This commit is contained in:
Jenkins 2015-07-14 19:12:14 +00:00 committed by Gerrit Code Review
parent 1bc472e79c 113d29ffeb
commit 9b03dcd9ef
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/elasticsearch.default.erb
View File

@ -3,7 +3,7 @@
#ES_GROUP=elasticsearch
# Heap Size (defaults to 256m min, 1g max)
ES_HEAP_SIZE=<%= heap_size %>
ES_HEAP_SIZE=<%= @heap_size %>
# Heap new generation
#ES_HEAP_NEWSIZE=

56
templates/elasticsearch.yml.erb
View File

@ -89,11 +89,11 @@ node.name: "<%= scope.lookupvar("::hostname") %>"
# to disable it, set the following:
# node.max_local_storage_nodes: 1
<% if es_template_config.has_key?('node.master') then -%>
node.master: <%= es_template_config['node.master'] %>
<% if @es_template_config.has_key?('node.master') then -%>
node.master: <%= @es_template_config['node.master'] %>
<% end -%>
<% if es_template_config.has_key?('node.data') then -%>
node.data: <%= es_template_config['node.data'] %>
<% if @es_template_config.has_key?('node.data') then -%>
node.data: <%= @es_template_config['node.data'] %>
<% end -%>
@ -112,16 +112,16 @@ node.data: <%= es_template_config['node.data'] %>
# Set the number of shards (splits) of an index (5 by default):
#
<% if es_template_config.has_key?('index.number_of_shards') then -%>
index.number_of_shards: <%= es_template_config['index.number_of_shards'] %>
<% if @es_template_config.has_key?('index.number_of_shards') then -%>
index.number_of_shards: <%= @es_template_config['index.number_of_shards'] %>
<% else -%>
# index.number_of_shards: 5
<% end -%>
# Set the number of replicas (additional copies) of an index (1 by default):
#
<% if es_template_config.has_key?('index.number_of_replicas') then -%>
index.number_of_replicas: <%= es_template_config['index.number_of_replicas'] %>
<% if @es_template_config.has_key?('index.number_of_replicas') then -%>
index.number_of_replicas: <%= @es_template_config['index.number_of_replicas'] %>
<% else -%>
# index.number_of_replicas: 1
<% end -%>
@ -153,14 +153,14 @@ index.number_of_replicas: <%= es_template_config['index.number_of_replicas'] %>
# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
# the index status.
<% if es_template_config.has_key?('index.store.compress.stored') then -%>
index.store.compress.stored: <%= es_template_config['index.store.compress.stored'] %>
<% if @es_template_config.has_key?('index.store.compress.stored') then -%>
index.store.compress.stored: <%= @es_template_config['index.store.compress.stored'] %>
<% end -%>
<% if es_template_config.has_key?('index.store.compress.tv') then -%>
index.store.compress.tv: <%= es_template_config['index.store.compress.tv'] %>
<% if @es_template_config.has_key?('index.store.compress.tv') then -%>
index.store.compress.tv: <%= @es_template_config['index.store.compress.tv'] %>
<% end -%>
<% if es_template_config.has_key?('indices.memory.index_buffer_size') then -%>
indices.memory.index_buffer_size: "<%= es_template_config['indices.memory.index_buffer_size'] %>"
<% if @es_template_config.has_key?('indices.memory.index_buffer_size') then -%>
indices.memory.index_buffer_size: "<%= @es_template_config['indices.memory.index_buffer_size'] %>"
<% end -%>
#################################### Paths ####################################
@ -209,8 +209,8 @@ path.data: "<%= es_template_config['path.data'] %>"
#
# Set this property to true to lock the memory:
#
<% if es_template_config.has_key?('bootstrap.mlockall') then -%>
bootstrap.mlockall: <%= es_template_config['bootstrap.mlockall'] %>
<% if @es_template_config.has_key?('bootstrap.mlockall') then -%>
bootstrap.mlockall: <%= @es_template_config['bootstrap.mlockall'] %>
<% else -%>
# bootstrap.mlockall: true
<% end -%>
@ -284,8 +284,8 @@ bootstrap.mlockall: <%= es_template_config['bootstrap.mlockall'] %>
# Allow recovery process after N nodes in a cluster are up:
#
<% if es_template_config.has_key?('gateway.recover_after_nodes') then -%>
gateway.recover_after_nodes: <%= es_template_config['gateway.recover_after_nodes'] %>
<% if @es_template_config.has_key?('gateway.recover_after_nodes') then -%>
gateway.recover_after_nodes: <%= @es_template_config['gateway.recover_after_nodes'] %>
<% else -%>
# gateway.recover_after_nodes: 1
<% end -%>
@ -293,8 +293,8 @@ gateway.recover_after_nodes: <%= es_template_config['gateway.recover_after_nodes
# Set the timeout to initiate the recovery process, once the N nodes
# from previous setting are up (accepts time value):
#
<% if es_template_config.has_key?('gateway.recover_after_time') then -%>
gateway.recover_after_time: <%= es_template_config['gateway.recover_after_time'] %>
<% if @es_template_config.has_key?('gateway.recover_after_time') then -%>
gateway.recover_after_time: <%= @es_template_config['gateway.recover_after_time'] %>
<% else -%>
# gateway.recover_after_time: 5m
<% end -%>
@ -303,8 +303,8 @@ gateway.recover_after_time: <%= es_template_config['gateway.recover_after_time']
# are up (and recover_after_nodes is met), begin recovery process immediately
# (without waiting for recover_after_time to expire):
#
<% if es_template_config.has_key?('gateway.expected_nodes') then -%>
gateway.expected_nodes: <%= es_template_config['gateway.expected_nodes'] %>
<% if @es_template_config.has_key?('gateway.expected_nodes') then -%>
gateway.expected_nodes: <%= @es_template_config['gateway.expected_nodes'] %>
<% else -%>
# gateway.expected_nodes: 2
<% end -%>
@ -345,8 +345,8 @@ gateway.expected_nodes: <%= es_template_config['gateway.expected_nodes'] %>
# operational within the cluster. Set this option to a higher value (2-4)
# for large clusters (>3 nodes):
#
<% if es_template_config.has_key?('discovery.zen.minimum_master_nodes') then -%>
discovery.zen.minimum_master_nodes: <%= es_template_config['discovery.zen.minimum_master_nodes'] %>
<% if @es_template_config.has_key?('discovery.zen.minimum_master_nodes') then -%>
discovery.zen.minimum_master_nodes: <%= @es_template_config['discovery.zen.minimum_master_nodes'] %>
<% else -%>
# discovery.zen.minimum_master_nodes: 1
<% end -%>
@ -366,8 +366,8 @@ discovery.zen.minimum_master_nodes: <%= es_template_config['discovery.zen.minimu
#
# 1. Disable multicast discovery (enabled by default):
#
<% if es_template_config.has_key?('discovery.zen.ping.multicast.enabled') then -%>
discovery.zen.ping.multicast.enabled: <%= es_template_config['discovery.zen.ping.multicast.enabled'] %>
<% if @es_template_config.has_key?('discovery.zen.ping.multicast.enabled') then -%>
discovery.zen.ping.multicast.enabled: <%= @es_template_config['discovery.zen.ping.multicast.enabled'] %>
<% else -%>
# discovery.zen.ping.multicast.enabled: false
<% end -%>
@ -377,8 +377,8 @@ discovery.zen.ping.multicast.enabled: <%= es_template_config['discovery.zen.ping
#
# discovery.zen.ping.unicast.hosts: ["host1", "host2:port", "host3[portX-portY]"]
#
<% if es_template_config.has_key?('discovery.zen.ping.unicast.hosts') then -%>
discovery.zen.ping.unicast.hosts: ["<%= es_template_config['discovery.zen.ping.unicast.hosts'].join("\", \"") %>"]
<% if @es_template_config.has_key?('discovery.zen.ping.unicast.hosts') then -%>
discovery.zen.ping.unicast.hosts: ["<%= @es_template_config['discovery.zen.ping.unicast.hosts'].join("\", \"") %>"]
<% end -%>
# EC2 discovery allows to use AWS EC2 API in order to perform discovery.