Tile caches: switch back to default parent (now orm)

diff --git a/roles/bunyip.rb b/roles/bunyip.rb
index 6a3ccae9ea87d118be4cb8ac0603367add64065d..cf73f558d007f4a8c93a9a497a313ca2fd3b7a55 100644 (file)
--- a/roles/bunyip.rb
+++ b/roles/bunyip.rb
@@ -80,9 +80,6 @@ default_attributes(
   :squid => {
     :cache_mem => "5000 MB",
     :cache_dir => "coss /dev/cciss/c0d1 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/fume.rb b/roles/fume.rb
index 8ef9e826dbfb0f5a30683474474954caa0eefff6..ac5b7ecd4a9f394fd1742b2148eee88191906ece 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -35,9 +35,6 @@ default_attributes(
        "block/cciss\!c0d1/queue/scheduler" => "noop"
       }
     }
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index c07d7059218f94097dfc64811c5946fda9fab23b..04abf97b34a9a459de4bb2180d5c10f582f58d07 100644 (file)
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -26,9 +26,6 @@ default_attributes(
   :squid => {
     :cache_mem => "5800 MB",
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/grisu.rb b/roles/grisu.rb
index 503a28199b86fde67bf8a90055fb847dc17962e0..37511e2f26079b61d77735c7740ce242c997fc08 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -30,9 +30,6 @@ default_attributes(
   :squid => {
     :cache_mem => "9000 MB",
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index c5021d468b57ee7eb27c7a875d74812f96bcc0fc..c01bd848c4ce2ffb8585b32fc89324203600e541 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -17,9 +17,6 @@ default_attributes(
   :squid => {
     :cache_mem => "650 MB",
     :cache_dir => "coss /store/squid/coss-01 15000 block-size=8192 max-size=262144 membufs=30"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/lurien.rb b/roles/lurien.rb
index aba5724cd0b43048063b71a7846ccab94fbb8f82..3900402084998ab76a04170c59c1a9cbd48c40de 100644 (file)
--- a/roles/lurien.rb
+++ b/roles/lurien.rb
@@ -25,9 +25,6 @@ default_attributes(
   :squid => {
     :cache_mem => "9000 MB",
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/nadder-01.rb b/roles/nadder-01.rb
index e31a0aa9a7d7c3c99aae6b6f115ea17d871fe8c1..0ce74c95c65f9e0dbcd9c656088c59d266a19ab7 100644 (file)
--- a/roles/nadder-01.rb
+++ b/roles/nadder-01.rb
@@ -28,9 +28,6 @@ default_attributes(
   :squid => {
     :cache_mem => "6500 MB",
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/nadder-02.rb b/roles/nadder-02.rb
index 1052af254cde934af539d7a99dc598706d208c22..70bff14edf8510d8783b4370b21a16aa87ec8ad1 100644 (file)
--- a/roles/nadder-02.rb
+++ b/roles/nadder-02.rb
@@ -28,9 +28,6 @@ default_attributes(
   :squid => {
     :cache_mem => "6500 MB",
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index 5dc3e27802cff3cc0847b58d896df70d065a6bc4..8a1c3679c85055205b477377f9a8f5c2c17e2485 100644 (file)
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -34,9 +34,6 @@ default_attributes(
        "block/vda/queue/scheduler" => "noop"
       }
     }
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 54e0d7e91cac69d7bc27897e779d1b6d549a6d81..cc6deb36bfad92076d99dbdbe7302a43a9e24c4d 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -28,9 +28,6 @@ default_attributes(
   :squid => {
     :cache_mem => "5500 MB",
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )
 

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 6ba4c3b7d2d440adcce61dbd2800aa4c381ad62c..20b4494dc02defd508a158a441f9099d4839446b 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -28,8 +28,7 @@ default_attributes(
   },
   :tilecache => {
     :ip_bucket_refill => "6144",
-    :net_bucket_refill => "24576",
-    :tile_parent => "orm.openstreetmap.org"
+    :net_bucket_refill => "24576"
   }
 )
 

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 48c2fc2ce02d46defc4fa4f6b88297f0c1a24899..9523f57339709b3483cf9e9acc2ff3c0c5e1a0fc 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -17,9 +17,6 @@ default_attributes(
   :squid => {
     :cache_mem => "6400 MB",
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "orm.openstreetmap.org"
   }
 )