Allow some extra apache processes to account for graceful termination

[chef.git] / roles / nepomuk.rb

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 53cd0ef80dccdd8651bcd05973b5922198e6b518..4abe868d14c594333ae363efc9b71e547a76a348 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -2,9 +2,6 @@ name "nepomuk"
 description "Master role applied to nepomuk"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "12g"
-  },
   :networking => {
     :firewall => {
       :inet => [
@@ -39,25 +36,6 @@ default_attributes(
       }
     }
   },
-  :sysctl => {
-    :kvm => {
-      :comment => "Tuning for KVM guest",
-      :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
-      }
-    }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "10240 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
   :sysfs => {
     :hdd_tune => {
       :comment => "Tune the queue for improved performance",
@@ -65,13 +43,9 @@ default_attributes(
         "block/vda/queue/nr_requests" => "128"
       }
     }
-  },
-  :tilecache => {
-    :tile_parent => "france.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[lyonix]",
-  "role[tilecache]"
+  "role[lyonix]"
 )