Remove remains of squid sibling support on tile caches

diff --git a/cookbooks/tilecache/attributes/default.rb b/cookbooks/tilecache/attributes/default.rb
index 56f490e86f68b5dba038f8fcd47a7c04b371f821..a830e0b38db4b95a58e3517cbc2cffd8f6014602 100644 (file)
--- a/cookbooks/tilecache/attributes/default.rb
+++ b/cookbooks/tilecache/attributes/default.rb
@@ -1,5 +1,4 @@
 default[:tilecache][:tile_parent] = "render.openstreetmap.org"
-default[:tilecache][:tile_siblings] = []
 
 # Per IP bucket refill rate
 default[:tilecache][:ip_bucket_refill] = 4096

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index b5187f3e43180c73101bafa1870ecce9590421d2..55415a4aca3e2412ab386a6fa46a9deda4afc324 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -35,12 +35,6 @@ acl tile_caches src <%= address %>
 <% end -%>
 <% end -%>
 
-# Siblings
-# Hit rate for sibling is extremely low. Not worth it.
-# <% node[:tilecache][:tile_siblings].each do |sibling| -%>
-# cache_peer <%= sibling %> sibling 3128 4827 htcp weight=1500
-# <% end -%>
-
 # Primary Parent
 <% if node[:squid][:version] < 4 -%>
 cache_peer <%= node[:tilecache][:tile_parent] %> parent 443 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=120 no-digest weight=1000 ssl ssldomain=render.openstreetmap.org

diff --git a/roles/glaedr.rb b/roles/glaedr.rb
index d4562c512e6320d4155f3b91f61ba43eae9d3609..19025b698e388b3f1b6379c343487a6f269f9811 100644 (file)
--- a/roles/glaedr.rb
+++ b/roles/glaedr.rb
@@ -43,10 +43,7 @@ default_attributes(
     }
   },
   :tilecache => {
-    :tile_parent => "bogota.render.openstreetmap.org",
-    :tile_siblings => [
-      "gorwen.openstreetmap.org"
-    ]
+    :tile_parent => "bogota.render.openstreetmap.org"
   }
 )
 

diff --git a/roles/gorwen.rb b/roles/gorwen.rb
index 640c0599bbf6a3987a232f8b091e13dce2243280..773e389cefb8c4f4628a44430a559dc6a3849e26 100644 (file)
--- a/roles/gorwen.rb
+++ b/roles/gorwen.rb
@@ -43,10 +43,7 @@ default_attributes(
     }
   },
   :tilecache => {
-    :tile_parent => "bogota.render.openstreetmap.org",
-    :tile_siblings => [
-      "glaedr.openstreetmap.org"
-    ]
+    :tile_parent => "bogota.render.openstreetmap.org"
   }
 )
 

diff --git a/roles/stormfly-01.rb b/roles/stormfly-01.rb
index 8d1830e2ed1137c14189f12bb936ad6451d0815a..eda9debcc0ef9a580ae398b82b86304964f1bc43 100644 (file)
--- a/roles/stormfly-01.rb
+++ b/roles/stormfly-01.rb
@@ -39,10 +39,7 @@ default_attributes(
     }
   },
   :tilecache => {
-    :tile_parent => "corvallis.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org"
-    ]
+    :tile_parent => "corvallis.render.openstreetmap.org"
   }
 )
 

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index c09c268fbe3d0cd063109bad9944b615a88ec75d..25cce34ae4e02fa0394374e6d691cd698e645164 100644 (file)
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -39,10 +39,7 @@ default_attributes(
     }
   },
   :tilecache => {
-    :tile_parent => "corvallis.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-01.openstreetmap.org"
-    ]
+    :tile_parent => "corvallis.render.openstreetmap.org"
   }
 )