From d4fcbbff1ce809d5da8d67c901b7ac31837972f2 Mon Sep 17 00:00:00 2001 From: Alex Monk Date: Sun, 7 Aug 2016 00:13:30 +0000 Subject: [PATCH] Access es_template_config with @ To prevent this on every puppet run: (warning): Variable access via 'es_template_config' is deprecated. Use '@es_template_config' instead. template[/etc/puppet/modules/elasticsearch/templates/elasticsearch.yml.erb]:33 Change-Id: Ie6c685d0748ce26c2bd2d227ce3b4e0578a95018 --- templates/elasticsearch.yml.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/elasticsearch.yml.erb b/templates/elasticsearch.yml.erb index 7701be9..a5debef 100644 --- a/templates/elasticsearch.yml.erb +++ b/templates/elasticsearch.yml.erb @@ -30,8 +30,8 @@ # multiple clusters on the same network, make sure you're using unique names. # # cluster.name: elasticsearch -<% if es_template_config.has_key?('cluster.name') then -%> -cluster.name: <%= es_template_config['cluster.name'] %> +<% if @es_template_config.has_key?('cluster.name') then -%> +cluster.name: <%= @es_template_config['cluster.name'] %> <% end -%> @@ -184,8 +184,8 @@ index.routing.allocation.total_shards_per_node: "<%= @es_template_config['index. # space on creation. For example: # # path.data: /path/to/data1,/path/to/data2 -<% if es_template_config.has_key?('path.data') then -%> -path.data: "<%= es_template_config['path.data'] %>" +<% if @es_template_config.has_key?('path.data') then -%> +path.data: "<%= @es_template_config['path.data'] %>" <% end -%> # Path to temporary files: @@ -273,12 +273,12 @@ network.publish_host: <%= @es_template_config['network.publish_host'] %> # # http.enabled: false -<% if es_template_config.has_key?('http.cors.enabled') then -%> -http.cors.enabled: <%= es_template_config['http.cors.enabled'] %> +<% if @es_template_config.has_key?('http.cors.enabled') then -%> +http.cors.enabled: <%= @es_template_config['http.cors.enabled'] %> <% end -%> -<% if es_template_config.has_key?('http.cors.allow-origin') then -%> -http.cors.allow-origin: <%= es_template_config['http.cors.allow-origin'] %> +<% if @es_template_config.has_key?('http.cors.allow-origin') then -%> +http.cors.allow-origin: <%= @es_template_config['http.cors.allow-origin'] %> <% end -%> ################################### Gateway ###################################