From 960aab171789210b26f3e9b83319fc492b4eda43 Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Tue, 6 Aug 2013 10:56:16 +0100
Subject: [PATCH] Tile caches: switch back to default parent (now orm)

---
 roles/bunyip.rb    | 3 ---
 roles/fume.rb      | 3 ---
 roles/gorynych.rb  | 3 ---
 roles/grisu.rb     | 3 ---
 roles/jakelong.rb  | 3 ---
 roles/lurien.rb    | 3 ---
 roles/nadder-01.rb | 3 ---
 roles/nadder-02.rb | 3 ---
 roles/nepomuk.rb   | 3 ---
 roles/ridgeback.rb | 3 ---
 roles/tabaluga.rb  | 3 +--
 roles/trogdor.rb   | 3 ---
 12 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/roles/bunyip.rb b/roles/bunyip.rb
index 6a3ccae9e..cf73f558d 100644
--- 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 8ef9e826d..ac5b7ecd4 100644
--- 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 c07d70592..04abf97b3 100644
--- 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 503a28199..37511e2f2 100644
--- 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 c5021d468..c01bd848c 100644
--- 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 aba5724cd..390040208 100644
--- 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 e31a0aa9a..0ce74c95c 100644
--- 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 1052af254..70bff14ed 100644
--- 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 5dc3e2780..8a1c3679c 100644
--- 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 54e0d7e91..cc6deb36b 100644
--- 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 6ba4c3b7d..20b4494dc 100644
--- 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 48c2fc2ce..9523f5733 100644
--- 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"
   }
 )
 
-- 
2.43.2