From: Tom Hughes <tom@compton.nu>
Date: Fri, 17 Feb 2017 14:51:52 +0000 (+0000)
Subject: Update elasticsearch to 2.x on ridley
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6437f10211bb33702e7bed9295e66777168e5330

Update elasticsearch to 2.x on ridley
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 57c279cd6..06edb02a0 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -96,12 +96,18 @@ apt_source "nginx" do
   key "ABF5BD827BD9BF62"
 end
 
-apt_source "elasticsearch" do
+apt_source "elasticsearch1.7" do
   source_template "elasticsearch.list.erb"
   url "http://packages.elasticsearch.org/elasticsearch/1.7/debian"
   key "D27D666CD88E42B4"
 end
 
+apt_source "elasticsearch2.x" do
+  source_template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/2.x/debian"
+  key "D27D666CD88E42B4"
+end
+
 apt_source "logstash" do
   source_template "elasticsearch.list.erb"
   url "http://packages.elasticsearch.org/logstash/2.3/debian"
diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb
index d3f6707c2..45d59a2b5 100644
--- a/cookbooks/elasticsearch/attributes/default.rb
+++ b/cookbooks/elasticsearch/attributes/default.rb
@@ -1,4 +1,7 @@
+default[:elasticsearch][:version] = "1.7"
 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][:path][:data] = "/var/lib/elasticsearch"
+
+default[:apt][:sources] |= ["elasticsearch#{node[:elasticsearch][:version]}"]
diff --git a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
index f9d8ebf75..ea04ea99a 100644
--- a/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
+++ b/cookbooks/elasticsearch/templates/default/elasticsearch.yml.erb
@@ -5,4 +5,6 @@ cluster.routing.allocation.disk.watermark.low: <%= node[:elasticsearch][:cluster
 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 -%>
diff --git a/roles/elasticsearch.rb b/roles/elasticsearch.rb
index ae0e2b6cc..59dcef23a 100644
--- a/roles/elasticsearch.rb
+++ b/roles/elasticsearch.rb
@@ -1,12 +1,6 @@
 name "elasticsearch"
 description "Role applied to all elasticsearch servers"
 
-default_attributes(
-  :apt => {
-    :sources => ["elasticsearch"]
-  }
-)
-
 run_list(
   "recipe[elasticsearch]"
 )
diff --git a/roles/foundation.rb b/roles/foundation.rb
index 338d1ab4c..22f8dc3eb 100644
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -11,6 +11,7 @@ default_attributes(
     :sources => ["passenger", "brightbox-ruby-ng"]
   },
   :elasticsearch => {
+    :version => "2.x",
     :cluster => {
       :name => "foundation"
     },