Bump kitchen-dokken from 2.18.0 to 2.19.0

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index ea377fb5b34ccb086ffaea2a85283341ceb474a3..d7b698e59682accfbf627faec9d5a105524796cb 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -2,9 +2,6 @@ name "ascalon"
 description "Master role applied to ascalon"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "18g"
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -16,24 +13,9 @@ default_attributes(
         :gateway => "184.107.48.225"
       }
     }
-  },
-  :squid => {
-    :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 => "montreal.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[netalerts]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[netalerts]"
 )