From 08d853efc90c809ebd90ac6832f80407769b92ba Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 20 Jun 2013 17:13:25 +0100 Subject: [PATCH] Revert "Teach tilecache cookbook to return caches sorted (deterministic)" This reverts commit 8d66a30c923fe2c0b25fb1e72677b5f9f19d6333. --- cookbooks/tilecache/recipes/default.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb index b97f2d43c..23edf0155 100644 --- 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") squid_fragment "tilecache" do template "squid.conf.erb" -- 2.43.2