Update elasticsearch to 5.x on ridley

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index 06edb02a05afdece6beb2b4e68cb6dd106329066..b9f19ad5e7e970ff983eb64cdab2ee3b812933c9 100644 (file)
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -108,6 +108,12 @@ apt_source "elasticsearch2.x" do
   key "D27D666CD88E42B4"
 end
 
   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"
 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 f306fe9254ec14ba51c7e187b674ddbf720347f4..02b880d5d65a2d3834c34202995de63381965d57 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -11,7 +11,7 @@ default_attributes(
     :sources => ["passenger", "brightbox-ruby-ng"]
   },
   :elasticsearch => {
     :sources => ["passenger", "brightbox-ruby-ng"]
   },
   :elasticsearch => {

-    :version => "2.x",
+    :version => "5.x",

     :cluster => {
       :name => "foundation"
     },
     :cluster => {
       :name => "foundation"
     },