Switch tilekiln version to attributes

diff --git a/cookbooks/vectortile/attributes/default.rb b/cookbooks/vectortile/attributes/default.rb
index b5e0933a61ac9301da6c66b35de97587799ea2d0..912b7ee2518fee2e9666fd37dc3555ad50e233af 100644 (file)
--- a/cookbooks/vectortile/attributes/default.rb
+++ b/cookbooks/vectortile/attributes/default.rb
@@ -8,6 +8,8 @@ default[:vectortile][:replication][:status] = :enabled
 default[:vectortile][:replication][:tileupdate] = :enabled
 default[:vectortile][:replication][:threads] = node.cpu_cores
 
+default[:vectortile][:tilekiln][:version] = "0.6.5"
+
 default[:postgresql][:versions] |= [node[:vectortile][:database][:cluster].split("/").first]
 default[:postgresql][:monitor_database] = "tiles"
 # As an absolute worst case, the server might have the serving, update, and a manual generation process going on.

diff --git a/cookbooks/vectortile/recipes/default.rb b/cookbooks/vectortile/recipes/default.rb
index a8a78044c18fa72e3375f3a0bb4c35b8aac04012..898a3367da404e1c2cf7b9e47e499b996ae072f6 100644 (file)
--- a/cookbooks/vectortile/recipes/default.rb
+++ b/cookbooks/vectortile/recipes/default.rb
@@ -100,7 +100,7 @@ end
 python_package "tilekiln" do
   python_virtualenv tilekiln_directory
   python_version "3"
-  version "0.6.5"
+  version node[:vectortile][:tilekiln][:version]
 end
 
 template "/srv/vector.openstreetmap.org/html/index.html" do