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

[chef.git] / roles / saphira.rb

diff --git a/roles/saphira.rb b/roles/saphira.rb
index b56d76cfffd92cff220f3c16e54256ff13c0dcb6..7da9a071463627441a88edbd8c9b6171110de997 100644 (file)
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -21,23 +21,10 @@ default_attributes(
         :gateway => "fe80::fcff:ffff:feff:ffff"
       }
     }
-  },
-  :squid => {
-    :cache_mem => "7500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "london.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "fume.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[jump]"
+  "role[jump]",
+  "role[geodns]"
 )