Push external network config in Amsterdam down to the hosts

[chef.git] / roles / longma.rb

diff --git a/roles/longma.rb b/roles/longma.rb
index b67537fa5e3e25467eeecbf0e8fbeb5ddb4ca179..23ce9dafb36de17276569786b23af2c56d9931d3 100644 (file)
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -4,11 +4,12 @@ description "Master role applied to longma"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.13",
+        :inet => {
+          :address => "10.0.64.13"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,17 +17,15 @@ default_attributes(
           :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "184.104.226.109"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::d"
+        :inet => {
+          :address => "184.104.226.109"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::d"
+        }
       }
     }
   },
@@ -36,13 +35,13 @@ default_attributes(
       :defaults => {
         :max_connections => "550",
         :work_mem => "240MB",
-        :fsync => "off",
+        :fsync => "on",
         :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
-    :state => "off",
+    :state => "standalone",
     :dbcluster => "14/main",
     :postgis => "3",
     :enable_qa_tiles => true,
@@ -52,11 +51,14 @@ default_attributes(
       "nominatim.openstreetmap.org" => {
         :max_children => 200
       }
+    },
+    :config => {
+      :forward_dependencies => "yes"
     }
   }
 )
 
 run_list(
   "role[equinix-dub]",
-  "role[nominatim-v4]"
+  "role[nominatim]"
 )