Add new Amsterdam IPv6 addresses to ACLs

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 0684875df40d631656d664508c85862ab30dd31d..a3af500778c79270fd79cc33262ad8482c1f0b71 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -4,75 +4,61 @@ description "Master role applied to dulcy"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.1",
+        :inet => {
+          :address => "10.0.48.9"
+        },
         :bond => {
-          :slaves => %w[p18p1 p18p2]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp1s0f0 enp1s0f1]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external_he => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.9"
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.179.137",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.103",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:9"
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.105",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
+        }
       }
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["17"],
     :settings => {
       :defaults => {
-        :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "on",
-        :effective_io_concurrency => "3"
+        :work_mem => "240MB",
+        :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
-    :state => "standalone",
-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
-    :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"
-      }
-    }
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :enable_qa_tiles => true,
+    :api_workers => 14,
+    :api_pool_size => 10
   }
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix-ams]",
   "role[nominatim]"
 )