From d29e6aa0b03a30551cbbdadc9354aedd4231929d Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Thu, 16 Jan 2014 19:04:23 +0000
Subject: [PATCH] tilecache: add best peers to each cache (based on avg ping
 latency)

---
 roles/bunyip.rb    | 7 ++++++-
 roles/fume.rb      | 5 ++++-
 roles/gorynych.rb  | 7 ++++++-
 roles/jakelong.rb  | 4 +++-
 roles/lurien.rb    | 7 ++++++-
 roles/nadder-01.rb | 5 ++++-
 roles/nadder-02.rb | 5 ++++-
 roles/nepomuk.rb   | 7 ++++++-
 roles/ridgeback.rb | 8 +++++++-
 roles/simurgh.rb   | 8 +++++++-
 roles/tabaluga.rb  | 7 ++++++-
 roles/trogdor.rb   | 5 ++++-
 12 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/roles/bunyip.rb b/roles/bunyip.rb
index f618353fb..c75ceca03 100644
--- a/roles/bunyip.rb
+++ b/roles/bunyip.rb
@@ -82,7 +82,12 @@ default_attributes(
     :cache_dir => "coss /dev/cciss/c0d1 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "brisbane.render.openstreetmap.org"
+    :tile_parent => "brisbane.render.openstreetmap.org",
+    :tile_siblings => [
+      "jakelong.openstreetmap.org",
+      "nadder-01.openstreetmap.org",
+      "nadder-02.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/fume.rb b/roles/fume.rb
index 8205b3c32..2944d541a 100644
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -39,7 +39,10 @@ default_attributes(
   :tilecache => {
     :tile_parent => "sjobo.render.openstreetmap.org",
     :tile_siblings => [
-      "trogdor.openstreetmap.org"
+      "trogdor.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "gorynych.openstreetmap.org"
     ]
   }
 )
diff --git a/roles/gorynych.rb b/roles/gorynych.rb
index 984b2aa75..0b035b182 100644
--- a/roles/gorynych.rb
+++ b/roles/gorynych.rb
@@ -28,7 +28,12 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "moscow.render.openstreetmap.org"
+    :tile_parent => "moscow.render.openstreetmap.org",
+    :tile_siblings => [
+      "nepomuk.openstreetmap.org",
+      "tabaluga.openstreetmap.org",
+      "fume.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index 44878a01e..41b409f5d 100644
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -30,7 +30,9 @@ default_attributes(
     :tile_parent => "sanfrancisco.render.openstreetmap.org",
     :tile_siblings => [
       "nadder-01.openstreetmap.org",
-      "nadder-02.openstreetmap.org"
+      "nadder-02.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "tabaluga.openstreetmap.org"
     ]
   }
 )
diff --git a/roles/lurien.rb b/roles/lurien.rb
index 98146c750..e4ab27cbf 100644
--- a/roles/lurien.rb
+++ b/roles/lurien.rb
@@ -27,7 +27,12 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "pau.render.openstreetmap.org"
+    :tile_parent => "pau.render.openstreetmap.org",
+    :tile_siblings => [
+      "tabaluga.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "ridgeback.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/nadder-01.rb b/roles/nadder-01.rb
index b086e238e..8eb9d562f 100644
--- a/roles/nadder-01.rb
+++ b/roles/nadder-01.rb
@@ -32,7 +32,10 @@ default_attributes(
   :tilecache => {
     :tile_parent => "provo.render.openstreetmap.org",
     :tile_siblings => [
-      "nadder-02.openstreetmap.org"
+      "nadder-02.openstreetmap.org",
+      "jakelong.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "lurien.openstreetmap.org"
     ]
   }
 )
diff --git a/roles/nadder-02.rb b/roles/nadder-02.rb
index 3fa156be3..9141e2a73 100644
--- a/roles/nadder-02.rb
+++ b/roles/nadder-02.rb
@@ -32,7 +32,10 @@ default_attributes(
   :tilecache => {
     :tile_parent => "provo.render.openstreetmap.org",
     :tile_siblings => [
-      "nadder-01.openstreetmap.org"
+      "nadder-01.openstreetmap.org",
+      "jakelong.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "lurien.openstreetmap.org"
     ]
   }
 )
diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb
index f0bf039cf..8d64f6ac3 100644
--- a/roles/nepomuk.rb
+++ b/roles/nepomuk.rb
@@ -36,7 +36,12 @@ default_attributes(
     }
   },
   :tilecache => {
-    :tile_parent => "lyon.render.openstreetmap.org"
+    :tile_parent => "lyon.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "lurien.openstreetmap.org",
+      "tabaluga.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 5a513ca13..78d0be7ee 100644
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -30,7 +30,13 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "oslo.render.openstreetmap.org"
+    :tile_parent => "oslo.render.openstreetmap.org",
+    :tile_siblings => [
+      "fume.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "tabaluga.openstreetmap.org",
+      "nepomuk.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/simurgh.rb b/roles/simurgh.rb
index acf989730..0c9595fa4 100644
--- a/roles/simurgh.rb
+++ b/roles/simurgh.rb
@@ -19,7 +19,13 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "baku.render.openstreetmap.org"
+    :tile_parent => "baku.render.openstreetmap.org",
+    :tile_siblings => [
+      "nepomuk.openstreetmap.org",
+      "tabaluga.openstreetmap.org",
+      "trogdor.openstreetmap.org",
+      "fume.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 63e85be9f..af0ea0edd 100644
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -29,7 +29,12 @@ default_attributes(
   :tilecache => {
     :ip_bucket_refill => "6144",
     :net_bucket_refill => "24576",
-    :tile_parent => "falkenstein.render.openstreetmap.org"
+    :tile_parent => "falkenstein.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "lurien.openstreetmap.org",
+      "ridgeback.openstreetmap.org"
+    ]
   }
 )
 
diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index 74fcb3f91..9429204ae 100644
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -21,7 +21,10 @@ default_attributes(
   :tilecache => {
     :tile_parent => "amsterdam.render.openstreetmap.org",
     :tile_siblings => [
-      "fume.openstreetmap.org"
+      "fume.openstreetmap.org",
+      "tabaluga.openstreetmap.org",
+      "nepomuk.openstreetmap.org",
+      "ridgeback.openstreetmap.org"
     ]
   }
 )
-- 
2.43.2