From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 13 Jun 2015 14:29:19 +0000 (+0200)
Subject: use a common tablespace layout for all nominatim servers
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0a02be35cffd8588ff0600bdf2005493db36697b?hp=c83004984b94938b143be1b3ccd1e4479820636c;ds=sidebyside

use a common tablespace layout for all nominatim servers

... or replication between servers will not work.
---

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index bf509ddde..86a2fe9cd 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -70,7 +70,19 @@ default_attributes(
   },
   :nominatim => {
     :enabled => true,
-    :repository => "git://git.openstreetmap.org/nominatim.git"
+    :repository => "git://git.openstreetmap.org/nominatim.git",
+    :tablespaces => {
+      "Osm2pgsql_Data" => "data",
+      "Osm2pgsql_Index" => "data",
+      "Place_Data" => "data",
+      "Place_Index" => "ssd2",
+      "Address_Data" => "data",
+      "Address_Index" => "ssd2",
+      "Search_Data" => "ssd1",
+      "Search_Index" => "ssd1",
+      "Aux_Data" => "aux",
+      "Aux_Index" => "aux"
+    }
   }
 )
 
diff --git a/roles/poldi.rb b/roles/poldi.rb
index 52b32e7e9..e121bf345 100644
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -88,18 +88,6 @@ default_attributes(
         :pm => "static",
         :max_children => "10"
       }
-    },
-    :tablespaces => {
-      "Osm2pgsql_Data" => "aux",
-      "Osm2pgsql_Index" => "data",
-      "Place_Data" => "ssd2",
-      "Place_Index" => "ssd1",
-      "Address_Data" => "ssd2",
-      "Address_Index" => "ssd1",
-      "Search_Data" => "ssd1",
-      "Search_Index" => "ssd1",
-      "Aux_Data" => "aux",
-      "Aux_Index" => "aux"
     }
   }
 )
diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 00ecfe5e5..eeaadfce9 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -50,18 +50,6 @@ default_attributes(
         :pm => "static",
         :max_children => "10"
       }
-    },
-    :tablespaces => {
-      "Osm2pgsql_Data" => "ssd",
-      "Osm2pgsql_Index" => "ssd",
-      "Place_Data" => "ssd",
-      "Place_Index" => "ssd",
-      "Address_Data" => "ssd",
-      "Address_Index" => "ssd",
-      "Search_Data" => "ssd",
-      "Search_Index" => "ssd",
-      "Aux_Data" => "data",
-      "Aux_Index" => "ssd"
     }
   }
 )