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

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 22f8dc3eb0f52ee170fc21cf9254b6a0168bdb7e..fb8024291d163f49403d30d253cf9041aca3957f 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -2,27 +2,27 @@ name "foundation"
 description "Role applied to all OSMF servers"
 
 default_attributes(
 description "Role applied to all OSMF servers"
 
 default_attributes(

-  :apache => {
-    :mpm => "prefork",
-    :timeout => 60,
-    :keepalive => false
-  },
-  :apt => {
-    :sources => ["passenger", "brightbox-ruby-ng"]
-  },

   :elasticsearch => {
   :elasticsearch => {

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

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

-    },
-    :script => {
-      :disable_dynamic => false

     }
   },
   :memcached => {
     :memory_limit => 400,
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
     }
   },
   :memcached => {
     :memory_limit => 400,
     :chunk_growth_factor => 1.05,
     :min_item_size => 5

+  },
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :innodb_buffer_pool_size => "512M",
+        :key_buffer_size => "64M",
+        :max_connections => "200",
+        :sort_buffer_size => "8M",
+        :tmp_table_size => "48M"
+      }
+    }

   }
 )
 
   }
 )
 


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

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

 )
 )