X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8cc107bab6a6ed356b9af5eec7486561a517df14..b616d843b86c3f6897eea08b3b96bb26eee06488:/roles/ridgeback.rb?ds=sidebyside

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index a68023042..9593ac4e0 100644
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -2,6 +2,12 @@ name "ridgeback"
 description "Master role applied to ridgeback"
 
 default_attributes(
+  :hardware => {
+    :ipmi => {
+      :excluded_sensors => [19, 20, 21, 22]
+    },
+    :shm_size => "10g"
+  },
   :munin => {
     :plugins => {
       :ipmi_fans => {
@@ -9,6 +15,16 @@ default_attributes(
         :Fan5 => { :graph => "no", :warning => "0:" },
         :Fan6 => { :graph => "no", :warning => "0:" },
         :Fan7CPU1 => { :graph => "no", :warning => "0:" }
+      },
+      :smart_sda => {
+        :smartctl_exit_status => {
+          :warning => 8
+        }
+      },
+      :smart_sdb => {
+        :smartctl_exit_status => {
+          :warning => 8
+        }
       }
     }
   },
@@ -36,38 +52,22 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "5500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "oslo.render.openstreetmap.org",
-    :tile_siblings => [
-      "fume.openstreetmap.org",
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "gorynych.openstreetmap.org",
-      "simurgh.openstreetmap.org"
+    :version => 4,
+    :cache_mem => "8192 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"
     ]
   },
-  :munin => {
-    :plugins => {
-      :smart_sda => {
-        :smartctl_exit_status => {
-          :warning => 8
-        }
-      },
-      :smart_sdb => {
-        :smartctl_exit_status => {
-          :warning => 8
-        }
-      }
-    }
+  :tilecache => {
+    :tile_parent => "oslo.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[blix-no]",
+  "role[geodns]",
   "role[tilecache]"
 )