From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Apr 2015 23:26:21 +0000 (+0100)
Subject: Use postgres 9.4 on yevaud
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a3fd2c2253fcca4fdf86ec4d70d3b3ca0eba8652?ds=sidebyside

Use postgres 9.4 on yevaud
---

diff --git a/roles/orm.rb b/roles/orm.rb
index a44ffd143..7b088c928 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -65,6 +65,9 @@ default_attributes(
     }
   },
   :tile => {
+    :database => {
+      :cluster => "9.1/main"
+    },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
diff --git a/roles/tile.rb b/roles/tile.rb
index 907b1ae88..e9344cc68 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -51,9 +51,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "9.1/main"
-    },
     :data => {
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 6d33455e4..fd8457ec5 100644
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -72,7 +72,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.1"],
+    :versions => ["9.4"],
     :settings => {
       :defaults => {
         :shared_buffers => "3GB",
@@ -98,6 +98,9 @@ default_attributes(
     }
   },
   :tile => {
+    :database => {
+      :cluster => "9.4/main"
+    },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {