Make configuration of hostname work properly

[chef.git] / roles / katie.rb

diff --git a/roles/katie.rb b/roles/katie.rb
index 763365cf5e3fa4a4181a841728732422830c8c9c..b54ebb13f66f2bdcc74e5e5497f59b73cf013f29 100644 (file)
--- a/roles/katie.rb
+++ b/roles/katie.rb
@@ -2,6 +2,21 @@ name "katie"
 description "Master role applied to katie"
 
 default_attributes(
+  :devices => {
+    :disktune => {
+      :comment => "Tune scheduler for Toshiba disks",
+      :type => "block",
+      :bus => "ata",
+      :serial => "TOSHIBA_DT01ACA300_*",
+      :attrs => {
+        "queue/scheduler" => "deadline"
+      }
+    }
+  },
+  :hardware => {
+    :shm_size => "20g"
+  },
+  :location => "Falkenstein, Germany",
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -23,23 +38,22 @@ default_attributes(
     }
   },
   :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+    :version => 4,
+    :cache_mem => "16384 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"
+    ]
   },
   :tilecache => {
-    :tile_parent => "falkenstein.render.openstreetmap.org",
-    :tile_siblings => [
-       "trogdor.openstreetmap.org",
-       "nepomuk.openstreetmap.org",
-       "ridgeback.openstreetmap.org",
-       "fume.openstreetmap.org",
-       "gorynych.openstreetmap.org",
-       "simurgh.openstreetmap.org"
-    ]
+    :tile_parent => "germany.render.openstreetmap.org"
   }
 )
 
 run_list(
   "role[hetzner]",
+  "role[geodns]",
   "role[tilecache]"
 )