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

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 9328d2688aff2803bacc14fe20a62c9d464c4049..fb8024291d163f49403d30d253cf9041aca3957f 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 => "6.x",
+    :version => "7.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"
       }


@@ -37,6 +32,5 @@ run_list(
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
   "recipe[foundation::dwg]",
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
   "recipe[foundation::dwg]",

-  "recipe[foundation::mwg]",
-  "recipe[foundation::owg]"
+  "recipe[foundation::mwg]"

 )
 )