Make bond configuration more robust

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 1a1e940808c249b810719cf4cd6f98c734314e1a..cc6b24fe653af8470b07e0888d6ea57c5616cff7 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -5,64 +5,50 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.9"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp1s0f0 enp1s0f1]
         }
       },
-      :external => {
-        :interface => "bond0.3",
-        :role => :external,
+      :henet => {
         :inet => {
           :address => "184.104.179.137"
         },
         :inet6 => {
           :address => "2001:470:1:fa1::9"
         }
+      },
+      :equinix => {
+        :inet => {
+          :address => "82.199.86.105"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::9"
+        }
       }
     }
   },
-  :accounts => {
-    :users => {
-      :lonvia => { :status => :administrator },
-      :nominatim => {
-        :status => :role,
-        :members => [:lonvia, :tomh]
+  :postgresql => {
+    :versions => ["17"],
+    :settings => {
+      :defaults => {
+        :work_mem => "240MB",
+        :effective_io_concurrency => "500"
       }
     }
+  },
+  :nominatim => {
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :enable_qa_tiles => false,
+    :api_workers => 14,
+    :api_pool_size => 10
   }
-  # :postgresql => {
-  #   :versions => ["15"],
-  #   :settings => {
-  #     :defaults => {
-  #       :work_mem => "240MB",
-  #       :effective_io_concurrency => "500"
-  #     }
-  #   }
-  # },
-  # :nominatim => {
-  #   :state => "standalone",
-  #   :dbcluster => "15/main",
-  #   :postgis => "3",
-  #   :flatnode_file => "/ssd/nominatim/nodes.store",
-  #   :logdir => "/ssd/nominatim/log",
-  #   :api_flavour => "python",
-  #   :api_workers => 14,
-  #   :api_pool_size => 10,
-  #   :config => {
-  #     :forward_dependencies => "yes"
-  #   }
-  # }
 )
 
 run_list(
-  "role[equinix-ams]"
-  # "role[nominatim]"
+  "role[equinix-ams-public]",
+  "role[nominatim]"
 )