Update configuration for move from Imperial to Amsterdam

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 447f6b5247fa1cb973b174c26540f7fb9b4b9c65..f444ded4442a54e4dc67360a13fd5f58cb82b363 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,48 +4,61 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "p18p1",
-        :role => :external,
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
         :family => :inet,
-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
+        :address => "10.0.48.1",
+        :bond => {
+          :slaves => %w[p18p1 p18p2]
+        }
       },
-      :external_ipv6 => {
-        :interface => "p18p1",
+      :external_ipv4 => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:630:12:500:ec4:7aff:fe66:96d2"
-      },
-      :internal_ipv4 => {
-        :interface => "p18p2",
-        :role => :internal,
         :family => :inet,
-        :address => "146.179.159.179",
-        :hwaddress => "0c:c4:7a:66:96:d3"
-      }
+        :address => "130.117.76.1"
+      },
+      # :external_ipv6 => {
+      #   :interface => "bond0.3",
+      #   :role => :external,
+      #   :family => :inet6,
+      #   :address => "2001:978:2:2C::172:1001"
+      # }
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
-        :fsync => "on"
+        :fsync => "on",
+        :effective_io_concurrency => "3"
       }
     }
   },
   :nominatim => {
-    :enabled => false,
+    :state => "standalone",
+    :enable_backup => false,
+    :enable_git_updates => true,
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "9.6/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
-    :database => {
-      :cluster => "9.5/main",
-      :dbname => "nominatim",
-      :postgis => "2.2"
+    :tablespaces => {
+      "dosm" => "/ssd/tablespaces/dosm",
+      "iosm" => "/ssd/tablespaces/iosm",
+      "dplace" => "/ssd/tablespaces/dplace",
+      "iplace" => "/ssd/tablespaces/iplace",
+      "daddress" => "/ssd/tablespaces/daddress",
+      "iaddress" => "/ssd/tablespaces/iaddress",
+      "dsearch" => "/ssd/tablespaces/dsearch",
+      "isearch" => "/ssd/tablespaces/isearch",
+      "daux" => "/ssd/tablespaces/daux",
+      "iaux" => "/ssd/tablespaces/iaux"
     }
   },
   :sysfs => {
@@ -61,5 +74,5 @@ default_attributes(
 
 run_list(
   "role[ic]",
-  "role[nominatim-standalone]"
+  "role[nominatim]"
 )