From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Nov 2017 19:44:34 +0000 (+0000)
Subject: Update elasticsearch to 5.x on ridley
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/ae1cc374c68e1626b180717b87532a7ecb4c6c2b?ds=sidebyside

Update elasticsearch to 5.x on ridley
---

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 06edb02a0..b9f19ad5e 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -108,6 +108,12 @@ apt_source "elasticsearch2.x" do
   key "D27D666CD88E42B4"
 end
 
+apt_source "elasticsearch5.x" do
+  source_template "elasticsearch.list.erb"
+  url "http://packages.elasticsearch.org/elasticsearch/5.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/roles/foundation.rb b/roles/foundation.rb
index f306fe925..02b880d5d 100644
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -11,7 +11,7 @@ default_attributes(
     :sources => ["passenger", "brightbox-ruby-ng"]
   },
   :elasticsearch => {
-    :version => "2.x",
+    :version => "5.x",
     :cluster => {
       :name => "foundation"
     },