Revert "Teach tilecache cookbook to return caches sorted (deterministic)"
authorGrant Slater <git@firefishy.com>
Thu, 20 Jun 2013 16:13:25 +0000 (17:13 +0100)
committerGrant Slater <git@firefishy.com>
Thu, 20 Jun 2013 16:13:25 +0000 (17:13 +0100)
This reverts commit 8d66a30c923fe2c0b25fb1e72677b5f9f19d6333.

cookbooks/tilecache/recipes/default.rb

index b97f2d43ce692dc2339e692c74e7162dfc4c6b12..23edf015557950d6065b7e6db4c3be5b16b2ed97 100644 (file)
 
 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")
 
 squid_fragment "tilecache" do
   template "squid.conf.erb"