Merge interface families

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 119bac8948cf833a4548e045f15c06a12eab1a95..5c067440a01091a4b2372fa35beb60fb72c5273e 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -1,27 +1,57 @@
 name "dulcy"
-description "Master role applied to dulcy
-"
+description "Master role applied to dulcy"
 
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "p18p1",
-        :role => :external,
-        :family => :inet,
-        :address => "193.63.75.109",
-        :hwaddress => "0c:c4:7a:66:96:d2"
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.48.9"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[ens18f0 ens18f1]
+        }
       },
-      :external_ipv6 => {
-        :interface => "p18p1",
+      :external => {
+        :interface => "bond0.2",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:630:12:500:ec4:7aff:fe66:96d2"
+        :inet => {
+          :address => "130.117.76.9"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:9"
+        }
+      }
+    }
+  },
+  :postgresql => {
+    :versions => ["14"],
+    :settings => {
+      :defaults => {
+        :work_mem => "240MB",
+        :fsync => "on",
+        :effective_io_concurrency => "500"
       }
     }
+  },
+  :nominatim => {
+    :state => "standalone",
+    :dbcluster => "14/main",
+    :postgis => "3",
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :logdir => "/ssd/nominatim/log",
+    :config => {
+      :forward_dependencies => "yes"
+    }
   }
 )
 
 run_list(
-  "role[ic]"
+  "role[equinix-ams]",
+  "role[nominatim]"
 )