Drop roles for thorn-02 and thorn-03

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 29a4548be815eb42a795fc26a8fe252291eee318..7fb9edefcf5ee501ca7ba641d9449ad3796fa041 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -10,6 +10,9 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[ens18f0 ens18f1]
         }
       },
@@ -32,9 +35,6 @@ default_attributes(
     :settings => {
       :defaults => {
         :work_mem => "240MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
         :fsync => "on",
         :effective_io_concurrency => "500"
       }
@@ -42,28 +42,10 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
     :dbcluster => "14/main",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
-    :config => {
-      :tokenizer => "icu"
-    },
-    :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"
-    }
+    :logdir => "/ssd/nominatim/log"
   }
 )