tilecache: add best peers to each cache (based on avg ping latency)

diff --git a/roles/bunyip.rb b/roles/bunyip.rb
index f618353fbbd262ad8d0636a44536e406b89edf46..c75ceca03c053d408aefdf1e8823d753bd6e4d24 100644 (file)
--- 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 8205b3c32c7a1799423fa200d6818e72d579e855..2944d541af6171a165626e13bd1ece0e98fbc3e5 100644 (file)
--- 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 984b2aa7559f53e125ba1db5402dfbba4a3d1d55..0b035b1825558c92426c2ba75c8f7a352f348678 100644 (file)
--- 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 44878a01e452cb04f24bf496676baf841680ad8e..41b409f5d76e25e6bf64f449f16be0ced178ab3e 100644 (file)
--- 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 98146c7509b9b5d4d37949adf6424685717fd758..e4ab27cbfbbbd7a98f6f1c2aa990291d0354c781 100644 (file)
--- 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 b086e238e90fce6c369ab5590786fbde5514dccd..8eb9d562f795979775ab8606f8e957d3bee08f43 100644 (file)
--- 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 3fa156be3b51ad9a39f8d77790067c35f13c1a36..9141e2a73c0c72d7c03deac94be01dd2aaf01eb4 100644 (file)
--- 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 f0bf039cf219666825bac4edf670365ef01c0df6..8d64f6ac3684538ddc396dfa847439b8b4f2a28e 100644 (file)
--- 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 5a513ca134b66e788a640a4800cd69ca36237a02..78d0be7ee8ba69e987dc790995643e5439638b9f 100644 (file)
--- 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 acf989730f5b77899098432cba99518544ea5307..0c9595fa4a96b010f271adb7cfb6c97ca8bf332e 100644 (file)
--- 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 63e85be9fd31a9b9e828a6455252c3940e2e53f3..af0ea0edd31ebaee479fbe472d7d023d4800f7cf 100644 (file)
--- 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 74fcb3f91f54bb243e3d259b0ad11bf02bb6dd11..9429204ae8792ef32476bfd9e25c06d5b3814574 100644 (file)
--- 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"
     ]
   }
 )