X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0da50ac02ab3efd4d66d6fc71d03534345c21344..73985606adf9c866cab4e8a414b05fe857a3f46d:/roles/dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index adf37e26e..bc2512881 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,74 +4,55 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.9",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[ens18f0 ens18f1]
+        }
+      },
       :external_ipv4 => {
-        :interface => "p18p1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
+        :address => "130.117.76.9"
       },
       :external_ipv6 => {
-        :interface => "p18p1",
+        :interface => "bond0.2",
         :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 => "2001:978:2:2C::172:9"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["14"],
     :settings => {
       :defaults => {
-        :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
+        :work_mem => "240MB",
         :fsync => "on",
-        :effective_io_concurrency => "3"
+        :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
     :state => "standalone",
-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
+    :dbcluster => "14/main",
+    :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
-    :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 => {
-    :md_tune => {
-      :comment => "Enable request merging for NVMe devices",
-      :parameters => {
-        "block/nvme0n1/queue/nomerges" => "1",
-        "block/nvme1n1/queue/nomerges" => "1"
-      }
+    :config => {
+      :forward_dependencies => "yes"
     }
   }
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix-ams]",
   "role[nominatim]"
 )