Spin up memcached on the web frontends

[chef.git] / roles / keizer.rb

diff --git a/roles/keizer.rb b/roles/keizer.rb
index 5c3ddea26e7afa095f806a07baf4de6bb2946955..3ce0de1abd38367715d94b6f55b70f15d4e51f6b 100644 (file)
--- a/roles/keizer.rb
+++ b/roles/keizer.rb
@@ -3,7 +3,7 @@ description "Master role applied to keizer"
 
 default_attributes(
   :hardware => {
 
 default_attributes(
   :hardware => {

-    :shm_size => "14g"
+    :shm_size => "12g"

   },
   :location => "Nuremberg, Germany",
   :networking => {
   },
   :location => "Nuremberg, Germany",
   :networking => {


@@ -28,7 +28,7 @@ default_attributes(
   },
   :squid => {
     :version => 4,
   },
   :squid => {
     :version => 4,

-    :cache_mem => "12288 MB",
+    :cache_mem => "8192 MB",

     :cache_dir => [
       "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
       "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
     :cache_dir => [
       "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
       "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",


@@ -37,11 +37,7 @@ default_attributes(
     ]
   },
   :tilecache => {
     ]
   },
   :tilecache => {

-    :tile_parent => "germany.render.openstreetmap.org",
-    :tile_siblings => [
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org"
-    ]
+    :tile_parent => "germany.render.openstreetmap.org"

   }
 )
 
   }
 )