From: Tom Hughes <tom@compton.nu>
Date: Wed, 21 Jun 2017 20:26:30 +0000 (+0100)
Subject: Update yevaud to postgresql 9.6 and carto v4.0.0
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/da4f47ac122ef3319553b7828c689c118945e2e0

Update yevaud to postgresql 9.6 and carto v4.0.0
---

diff --git a/roles/orm.rb b/roles/orm.rb
index 3c47c55fa..75e2e1252 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -71,7 +71,6 @@ default_attributes(
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
-        :revision => "v4.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 },
           { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }
diff --git a/roles/scorch.rb b/roles/scorch.rb
index d6823bca0..b22c905f9 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -75,7 +75,6 @@ default_attributes(
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
-        :revision => "v4.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
diff --git a/roles/tile.rb b/roles/tile.rb
index 586bb25cf..4fb78586e 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -90,7 +90,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v3.3.0",
+        :revision => "v4.0.0",
         :max_zoom => 19
       }
     }
diff --git a/roles/vial.rb b/roles/vial.rb
index 30b995fb5..1b3aa0ad9 100644
--- a/roles/vial.rb
+++ b/roles/vial.rb
@@ -64,7 +64,6 @@ default_attributes(
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
-        :revision => "v4.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 2895db245..16fb61bb3 100644
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -89,7 +89,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -109,7 +109,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.5/main"
+      :cluster => "9.6/main"
     },
     :node_file => "/store/database/nodes",
     :styles => {