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

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 85efc53f7a0b3f41e68d6949fb556921fd9115df..bafa81db75bf0647e5c77a8e01c77217bccfb2f8 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -2,11 +2,8 @@ name "foundation"
 description "Role applied to all OSMF servers"
 
 default_attributes(
 description "Role applied to all OSMF servers"
 
 default_attributes(

-  :apt => {
-    :sources => ["passenger"]
-  },

   :elasticsearch => {
   :elasticsearch => {

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

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


@@ -22,8 +19,6 @@ default_attributes(
         :innodb_buffer_pool_size => "512M",
         :key_buffer_size => "64M",
         :max_connections => "200",
         :innodb_buffer_pool_size => "512M",
         :key_buffer_size => "64M",
         :max_connections => "200",

-        :query_cache_size => "48M",
-        :query_cache_type => "1",

         :sort_buffer_size => "8M",
         :tmp_table_size => "48M"
       }
         :sort_buffer_size => "8M",
         :tmp_table_size => "48M"
       }