Bump cookstyle from 7.20.0 to 7.21.0

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 447f6b5247fa1cb973b174c26540f7fb9b4b9c65..98c938615378e8289ef4560400b2e7ef355b94d3 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,62 +4,67 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.9",
+        :bond => {
+          :slaves => %w[ens18f0 ens18f1]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "p18p1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
+        :address => "130.117.76.9"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "p18p1",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :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 => {
       }
     }
   },
   :postgresql => {

-    :versions => ["9.5"],
+    :versions => ["13"],

     :settings => {
       :defaults => {
         :work_mem => "300MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
     :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 => "500"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

-    :enabled => false,
+    :state => "standalone",
+    :enable_backup => false,
+    :enable_git_updates => true,
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "13/main",
+    :postgis => "3",

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",

-    :database => {
-      :cluster => "9.5/main",
-      :dbname => "nominatim",
-      :postgis => "2.2"
-    }
-  },
-  :sysfs => {
-    :md_tune => {
-      :comment => "Enable request merging for NVMe devices",
-      :parameters => {
-        "block/nvme0n1/queue/nomerges" => "1",
-        "block/nvme1n1/queue/nomerges" => "1"
-      }
+    :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"

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[ic]",
-  "role[nominatim-standalone]"
+  "role[equinix]",
+  "role[nominatim]"

 )
 )