Don't apply HP disk rules to disks not on HP controllers

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 51f6efab8dd3bb5ec11bb954ce996265486daaa8..bc251288181b27ebac5f51e650db2acc17dce4b7 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -10,7 +10,10 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {

-          :slaves => %w[p18p1 p18p2]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[ens18f0 ens18f1]

         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {


@@ -28,52 +31,28 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.6"],
+    :versions => ["14"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
+        :work_mem => "240MB",

         :fsync => "on",
         :fsync => "on",

-        :effective_io_concurrency => "3"
+        :effective_io_concurrency => "500"

       }
     }
   },
   :nominatim => {
     :state => "standalone",
       }
     }
   },
   :nominatim => {
     :state => "standalone",

-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
-    :postgis => "2.3",
+    :dbcluster => "14/main",
+    :postgis => "3",

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :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(
     }
   }
 )
 
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )