Upgrade bytemark machines to chef 13

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 51d697e88960ddf007dea13e758c026c22bbc520..42d25d9d0249185cd3de69be1918f4267d97c9a5 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -13,14 +13,36 @@ default_attributes(
   :apache => {
     :mpm => "event",
     :event => {
   :apache => {
     :mpm => "event",
     :event => {

-      :max_requests_per_child => 2000
+      :min_spare_threads => 50,
+      :max_spare_threads => 150

     }
   },
     }
   },

+  :apt => {
+    :sources => ["brightbox-ruby-ng"]
+  },

   :hardware => {
   :hardware => {

+    :mcelog => {
+      :enabled => false
+    },

     :modules => [
       "it87"
     ]
   },
     :modules => [
       "it87"
     ]
   },

+  :openvpn => {
+    :address => "10.0.16.3",
+    :tunnels => {
+      :shenron2ucl => {
+        :port => "1194",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }
+      }
+    }
+  }
+)
+
+override_attributes(

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -40,18 +62,6 @@ default_attributes(
         :gateway => "fe80::1"
       }
     }
         :gateway => "fe80::1"
       }
     }

-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
-    }

   }
 )
 
   }
 )
 


@@ -67,5 +77,6 @@ run_list(
   "role[dns]",
   "role[geodns]",
   "role[chef-repository]",
   "role[dns]",
   "role[geodns]",
   "role[chef-repository]",

+  "recipe[blogs]",

   "recipe[openvpn]"
 )
   "recipe[openvpn]"
 )