opendev
/
puppet-elasticsearch
Code Issues Proposed changes

Fixing deprecation warnings 

Non instance variable representation is deprecated
so needs to be changed. This change changes varibles
to their instance variable representation.

See more details see:
http://docs.puppetlabs.com/guides/templating.html

Change-Id: Ib77827e01011ef6c0380c9ec7a9d147eafd8ce2f
This commit is contained in:
Spencer Krum 2014-06-18 15:44:01 -07:00 committed by Spencer Krum
parent 295bcb7ee0
commit f039738b9f
2 changed files with 21 additions and 21 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 #ES_GROUP=elasticsearch
# Heap Size (defaults to 256m min, 1g max) # Heap Size (defaults to 256m min, 1g max)
ES_HEAP_SIZE=<%= heap_size %> ES_HEAP_SIZE=<%= @heap_size %>
# Heap new generation # Heap new generation
#ES_HEAP_NEWSIZE= #ES_HEAP_NEWSIZE=

40
templates/elasticsearch.yml.erb
View File

@ -135,14 +135,14 @@ node.name: "<%= scope.lookupvar("::hostname") %>"
# Use the Index Status API (<http://localhost:9200/A/_status>) to inspect # Use the Index Status API (<http://localhost:9200/A/_status>) to inspect
# the index status. # the index status.
<% if es_template_config.has_key?('index.store.compress.stored') then -%> <% if @es_template_config.has_key?('index.store.compress.stored') then -%>
index.store.compress.stored: <%= es_template_config['index.store.compress.stored'] %> index.store.compress.stored: <%= @es_template_config['index.store.compress.stored'] %>
<% end -%> <% end -%>
<% if es_template_config.has_key?('index.store.compress.tv') then -%> <% if @es_template_config.has_key?('index.store.compress.tv') then -%>
index.store.compress.tv: <%= es_template_config['index.store.compress.tv'] %> index.store.compress.tv: <%= @es_template_config['index.store.compress.tv'] %>
<% end -%> <% end -%>
<% if es_template_config.has_key?('indices.memory.index_buffer_size') then -%> <% 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'] %>" indices.memory.index_buffer_size: "<%= @es_template_config['indices.memory.index_buffer_size'] %>"
<% end -%> <% end -%>
#################################### Paths #################################### #################################### Paths ####################################
@ -188,8 +188,8 @@ indices.memory.index_buffer_size: "<%= es_template_config['indices.memory.index_
# #
# Set this property to true to lock the memory: # Set this property to true to lock the memory:
# #
<% if es_template_config.has_key?('bootstrap.mlockall') then -%> <% if @es_template_config.has_key?('bootstrap.mlockall') then -%>
bootstrap.mlockall: <%= es_template_config['bootstrap.mlockall'] %> bootstrap.mlockall: <%= @es_template_config['bootstrap.mlockall'] %>
<% else -%> <% else -%>
# bootstrap.mlockall: true # bootstrap.mlockall: true
<% end -%> <% end -%>
@ -263,8 +263,8 @@ bootstrap.mlockall: <%= es_template_config['bootstrap.mlockall'] %>
# Allow recovery process after N nodes in a cluster are up: # Allow recovery process after N nodes in a cluster are up:
# #
<% if es_template_config.has_key?('gateway.recover_after_nodes') then -%> <% if @es_template_config.has_key?('gateway.recover_after_nodes') then -%>
gateway.recover_after_nodes: <%= es_template_config['gateway.recover_after_nodes'] %> gateway.recover_after_nodes: <%= @es_template_config['gateway.recover_after_nodes'] %>
<% else -%> <% else -%>
# gateway.recover_after_nodes: 1 # gateway.recover_after_nodes: 1
<% end -%> <% end -%>
@ -272,8 +272,8 @@ gateway.recover_after_nodes: <%= es_template_config['gateway.recover_after_nodes
# Set the timeout to initiate the recovery process, once the N nodes # Set the timeout to initiate the recovery process, once the N nodes
# from previous setting are up (accepts time value): # from previous setting are up (accepts time value):
# #
<% if es_template_config.has_key?('gateway.recover_after_time') then -%> <% if @es_template_config.has_key?('gateway.recover_after_time') then -%>
gateway.recover_after_time: <%= es_template_config['gateway.recover_after_time'] %> gateway.recover_after_time: <%= @es_template_config['gateway.recover_after_time'] %>
<% else -%> <% else -%>
# gateway.recover_after_time: 5m # gateway.recover_after_time: 5m
<% end -%> <% end -%>
@ -282,8 +282,8 @@ gateway.recover_after_time: <%= es_template_config['gateway.recover_after_time']
# are up (and recover_after_nodes is met), begin recovery process immediately # are up (and recover_after_nodes is met), begin recovery process immediately
# (without waiting for recover_after_time to expire): # (without waiting for recover_after_time to expire):
# #
<% if es_template_config.has_key?('gateway.expected_nodes') then -%> <% if @es_template_config.has_key?('gateway.expected_nodes') then -%>
gateway.expected_nodes: <%= es_template_config['gateway.expected_nodes'] %> gateway.expected_nodes: <%= @es_template_config['gateway.expected_nodes'] %>
<% else -%> <% else -%>
# gateway.expected_nodes: 2 # gateway.expected_nodes: 2
<% end -%> <% end -%>
@ -324,8 +324,8 @@ gateway.expected_nodes: <%= es_template_config['gateway.expected_nodes'] %>
# operational within the cluster. Set this option to a higher value (2-4) # operational within the cluster. Set this option to a higher value (2-4)
# for large clusters (>3 nodes): # for large clusters (>3 nodes):
# #
<% if es_template_config.has_key?('discovery.zen.minimum_master_nodes') then -%> <% 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'] %> discovery.zen.minimum_master_nodes: <%= @es_template_config['discovery.zen.minimum_master_nodes'] %>
<% else -%> <% else -%>
# discovery.zen.minimum_master_nodes: 1 # discovery.zen.minimum_master_nodes: 1
<% end -%> <% end -%>
@ -345,8 +345,8 @@ discovery.zen.minimum_master_nodes: <%= es_template_config['discovery.zen.minimu
# #
# 1. Disable multicast discovery (enabled by default): # 1. Disable multicast discovery (enabled by default):
# #
<% if es_template_config.has_key?('discovery.zen.ping.multicast.enabled') then -%> <% 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'] %> discovery.zen.ping.multicast.enabled: <%= @es_template_config['discovery.zen.ping.multicast.enabled'] %>
<% else -%> <% else -%>
# discovery.zen.ping.multicast.enabled: false # discovery.zen.ping.multicast.enabled: false
<% end -%> <% end -%>
@ -356,8 +356,8 @@ discovery.zen.ping.multicast.enabled: <%= es_template_config['discovery.zen.ping
# #
# discovery.zen.ping.unicast.hosts: ["host1", "host2:port", "host3[portX-portY]"] # discovery.zen.ping.unicast.hosts: ["host1", "host2:port", "host3[portX-portY]"]
# #
<% if es_template_config.has_key?('discovery.zen.ping.unicast.hosts') then -%> <% 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("\", \"") %>"] discovery.zen.ping.unicast.hosts: ["<%= @es_template_config['discovery.zen.ping.unicast.hosts'].join("\", \"") %>"]
<% end -%> <% end -%>
# EC2 discovery allows to use AWS EC2 API in order to perform discovery. # EC2 discovery allows to use AWS EC2 API in order to perform discovery.