Update kitchen tests for changes to frontend and backend services

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 338d1ab4cbd5174992fdab88c55701e617929481..6220831642491e998bfe5d8ea18447e791fc4420 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -3,25 +3,35 @@ description "Role applied to all OSMF servers"
 
 default_attributes(
   :apache => {
 
 default_attributes(
   :apache => {

-    :mpm => "prefork",

     :timeout => 60,
     :keepalive => false
   },
   :apt => {
     :timeout => 60,
     :keepalive => false
   },
   :apt => {

-    :sources => ["passenger", "brightbox-ruby-ng"]
+    :sources => ["passenger"]

   },
   :elasticsearch => {
   },
   :elasticsearch => {

+    :version => "5.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",
+        :query_cache_size => "48M",
+        :query_cache_type => "1",
+        :sort_buffer_size => "8M",
+        :tmp_table_size => "48M"
+      }
+    }

   }
 )
 
   }
 )
 


@@ -31,5 +41,6 @@ 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::owg]"
 )