Teach tilecache cookbook to return caches sorted (deterministic)

[chef.git] / cookbooks / tilecache / recipes / default.rb

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index b97f2d43ce692dc2339e692c74e7162dfc4c6b12..5b44be21f313db1cb067862da07f61062bd50b13 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -19,11 +19,7 @@
 
 include_recipe "squid"
 
-expiry_time = 14 * 86400
-
-tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n|
-  { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] }
-end
+tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 squid_fragment "tilecache" do
   template "squid.conf.erb"