Merge remote-tracking branch 'github/pull/699'

[chef.git] / cookbooks / elasticsearch / attributes / default.rb

diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb
index 45d59a2b58ac16f8fb4a169f7f33120b7379bdc7..52f6b95990150821ebc0d5680225e4de0c7b2af2 100644 (file)
--- a/cookbooks/elasticsearch/attributes/default.rb
+++ b/cookbooks/elasticsearch/attributes/default.rb
@@ -1,7 +1,6 @@
-default[:elasticsearch][:version] = "1.7"
+default[:elasticsearch][:version] = "6.x"
+default[:elasticsearch][:cluster][:name] = "default"

 default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:low] = "85%"
 default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:high] = "90%"
 default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:low] = "85%"
 default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:high] = "90%"

-default[:elasticsearch][:script][:disable_dynamic] = true
+default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:flood_stage] = "95%"

 default[:elasticsearch][:path][:data] = "/var/lib/elasticsearch"
 default[:elasticsearch][:path][:data] = "/var/lib/elasticsearch"

-
-default[:apt][:sources] |= ["elasticsearch#{node[:elasticsearch][:version]}"]