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

[chef.git] / roles / neak.rb

diff --git a/roles/neak.rb b/roles/neak.rb
index b54155b0e05b1019bdcc8db8b76cc268467bddfc..190e3f533fdfa5cab56099cd0437529335ec3a48 100644 (file)
--- a/roles/neak.rb
+++ b/roles/neak.rb
@@ -2,9 +2,6 @@ name "neak"
 description "Master role applied to neak"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "14g"
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -16,23 +13,9 @@ default_attributes(
         :gateway => "89.234.177.129"
       }
     }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "10240 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",
-      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :tilecache => {
-    :tile_parent => "france.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[faimaison]",
-  "role[tilecache]"
+  "role[faimaison]"
 )