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

[chef.git] / roles / trogdor.rb

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 4c6c3f56869e41ddb84ab1b3f7dd25b3c5572bf5..cfa86b2b29d2108c6ec1aa4e6c063ad6e6e84dc7 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -24,23 +24,9 @@ default_attributes(
         "block/md1/md/sync_speed_max" => "100000"
       }
     }
         "block/md1/md/sync_speed_max" => "100000"
       }
     }

-  },
-  :squid => {
-    :cache_mem => "6400 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "amsterdam.render.openstreetmap.org",
-    :tile_siblings => [
-      "fume.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
-      "nepomuk.openstreetmap.org",
-      "ridgeback.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[blix-nl]",
-  "role[tilecache]"
+  "role[blix-nl]"

 )
 )