Move tile cache sibling configuration to roles

diff --git a/cookbooks/tilecache/attributes/default.rb b/cookbooks/tilecache/attributes/default.rb
index 2e8471518fc81627c47f4ab0f943089294c49be6..e91bd96178dab5d304cd37e50fae092947532cd7 100644 (file)
--- a/cookbooks/tilecache/attributes/default.rb
+++ b/cookbooks/tilecache/attributes/default.rb
@@ -1,5 +1,6 @@
 
 default[:tilecache][:tile_parent] = "parent.tile.openstreetmap.org"
+default[:tilecache][:tile_siblings] = []
 
 #Per IP bucket refill rate
 default[:tilecache][:ip_bucket_refill] = "8192"

diff --git a/cookbooks/tilecache/templates/default/squid.conf.erb b/cookbooks/tilecache/templates/default/squid.conf.erb
index c4a1a951b267321294f4d940a5c84c0160347451..d8fe021acfc75abf9bb2017f4f2155e95e48b984 100644 (file)
--- a/cookbooks/tilecache/templates/default/squid.conf.erb
+++ b/cookbooks/tilecache/templates/default/squid.conf.erb
@@ -29,21 +29,8 @@ http_access allow osmtile_sites
 acl osmtile_nocache_url urlpath_regex \.png/(status|dirty)$
 cache deny osmtile_sites osmtile_nocache_url
 
-<% if node[:fqdn] == "nadder-01.openstreetmap.org" -%>
-cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "nadder-02.openstreetmap.org" -%> 
-cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "trogdor.openstreetmap.org" -%>
-cache_peer fume.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "fume.openstreetmap.org" -%>
-cache_peer trogdor.openstreetmap.org sibling 3128 3130 proxy-only
-<% end -%>
-<% if node[:fqdn] == "jakelong.openstreetmap.org" -%>
-cache_peer nadder-01.openstreetmap.org sibling 3128 3130 proxy-only
-cache_peer nadder-02.openstreetmap.org sibling 3128 3130 proxy-only
+<% node[:tilecache][:tile_siblings].each do |sibling| -%>
+cache_peer <%= sibling %> sibling 3128 3130 proxy-only
 <% end -%>
 #Primary Parent
 cache_peer <%= node[:tilecache][:tile_parent] %> parent 80 0 no-query originserver name=osmtileAccel login=PASS connect-timeout=60 no-digest weight=1000

diff --git a/roles/fume.rb b/roles/fume.rb
index cf96ecb43c426cddf7e7a6dc290aa29791a014db..8205b3c32c7a1799423fa200d6818e72d579e855 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -37,7 +37,10 @@ default_attributes(
     }
   },
   :tilecache => {
-    :tile_parent => "sjobo.render.openstreetmap.org"
+    :tile_parent => "sjobo.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org"
+    ]
   }
 )
 

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index b164b6c893ab461d427b4fe39ff8bd3a5bd32a08..44878a01e452cb04f24bf496676baf841680ad8e 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -27,7 +27,11 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 15000 block-size=8192 max-size=262144 membufs=30"
   },
   :tilecache => {
-    :tile_parent => "sanfrancisco.render.openstreetmap.org"
+    :tile_parent => "sanfrancisco.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-01.openstreetmap.org",
+      "nadder-02.openstreetmap.org"
+    ]
   }
 )
 

diff --git a/roles/nadder-01.rb b/roles/nadder-01.rb
index b61d80644e49388462434e569f50b591950e0a9c..b086e238e90fce6c369ab5590786fbde5514dccd 100644 (file)
--- a/roles/nadder-01.rb
+++ b/roles/nadder-01.rb
@@ -30,7 +30,10 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "provo.render.openstreetmap.org"
+    :tile_parent => "provo.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-02.openstreetmap.org"
+    ]
   }
 )
 

diff --git a/roles/nadder-02.rb b/roles/nadder-02.rb
index c2315ba9c7d02e88f36eb4468e9ae280ede2d9af..3fa156be3b51ad9a39f8d77790067c35f13c1a36 100644 (file)
--- a/roles/nadder-02.rb
+++ b/roles/nadder-02.rb
@@ -30,7 +30,10 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "provo.render.openstreetmap.org"
+    :tile_parent => "provo.render.openstreetmap.org",
+    :tile_siblings => [
+      "nadder-01.openstreetmap.org"
+    ]
   }
 )
 

diff --git a/roles/trogdor.rb b/roles/trogdor.rb
index e2048af6c7800ed3db351af8b42a682f82a2f80f..74fcb3f91f54bb243e3d259b0ad11bf02bb6dd11 100644 (file)
--- a/roles/trogdor.rb
+++ b/roles/trogdor.rb
@@ -19,7 +19,10 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "amsterdam.render.openstreetmap.org"
+    :tile_parent => "amsterdam.render.openstreetmap.org",
+    :tile_siblings => [
+      "fume.openstreetmap.org"
+    ]
   }
 )