Remove nominatim role from stormfly-04 during initial reinstall

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index cc4e43c085c22701cc569aaf249bd620b66a0e8f..420522c593d99f348cb2533ba7a0b063f79860b1 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -14,64 +14,36 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
-          :slaves => %w[ens18f0 ens18f1]
-        }
-      },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.9",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:9",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :slaves => %w[enp1s0f0 enp1s0f1]
         }
       },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.137",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.137"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::9",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::9"
         }
       }
     }
   },
   :postgresql => {
-    :versions => ["14"],
+    :versions => ["17"],
     :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"
-    }
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :enable_qa_tiles => true,
+    :api_workers => 14,
+    :api_pool_size => 10
   }
 )