Merge remote-tracking branch 'github/pull/474'

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 9593ac4e06e8083f455b68849bc65d0b1f525d0d..75ddb901cd23d30ba118597751707ad05c9ac0ff 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -5,8 +5,7 @@ default_attributes(
   :hardware => {
     :ipmi => {
       :excluded_sensors => [19, 20, 21, 22]
   :hardware => {
     :ipmi => {
       :excluded_sensors => [19, 20, 21, 22]

-    },
-    :shm_size => "10g"
+    }

   },
   :munin => {
     :plugins => {
   },
   :munin => {
     :plugins => {


@@ -50,24 +49,10 @@ default_attributes(
         "block/md1/md/sync_speed_max" => "100000"
       }
     }
         "block/md1/md/sync_speed_max" => "100000"
       }
     }

-  },
-  :squid => {
-    :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"
-    ]
-  },
-  :tilecache => {
-    :tile_parent => "oslo.render.openstreetmap.org"

   }
 )
 
 run_list(
   "role[blix-no]",
   }
 )
 
 run_list(
   "role[blix-no]",

-  "role[geodns]",
-  "role[tilecache]"
+  "role[geodns]"

 )
 )