Update elasticsearch to 2.x on ridley

[chef.git] / cookbooks / elasticsearch / templates / default / elasticsearch.yml.erb

diff --git a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
index 1df2ea50c9d5270c3da5730f4c6ff2e163d5678c..ea04ea99ace24a3ea8de811afd6954314256a83d 100644 (file)
--- a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
+++ b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
@@ -1,6 +1,10 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 cluster.name: <%= node[:elasticsearch][:cluster][:name] %>
+cluster.routing.allocation.disk.watermark.low: <%= node[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:low] %>
+cluster.routing.allocation.disk.watermark.high: <%= node[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:high] %>
 network.host: 127.0.0.1
 path.data: <%= node[:elasticsearch][:path][:data] %>
+<% if node[:elasticsearch][:script][:disable_dynamic] -%>
 script.disable_dynamic: <%= node[:elasticsearch][:script][:disable_dynamic] -%>
+<% end -%>