nominatim: remove unused variable

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index eb8d29526339094ad4a4629e6fd93f3dda23f674..420522c593d99f348cb2533ba7a0b063f79860b1 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -1,68 +1,53 @@
 name "dulcy"
 name "dulcy"

-description "Master role applied to dulcy
-"
+description "Master role applied to dulcy"

 
 default_attributes(
   :networking => {
     :interfaces => {
 
 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[enp1s0f0 enp1s0f1]
+        }

       },
       },

-      :external_ipv6 => {
-        :interface => "p18p1",
+      :external => {
+        :interface => "bond0.3",

         :role => :external,
         :role => :external,

-        :family => :inet6,
-        :address => "2001:630:12:500:ec4:7aff:fe66:96d2"
-      },
-      :internal_ipv4 => {
-        :interface => "p18p2",
-        :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.179",
-        :hwaddress => "0c:c4:7a:66:96:d3"
+        :inet => {
+          :address => "184.104.179.137"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::9"
+        }

       }
     }
   },
   :postgresql => {
       }
     }
   },
   :postgresql => {

+    :versions => ["17"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "on"
+        :work_mem => "240MB",
+        :effective_io_concurrency => "500"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

-    :enabled => false,
-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :logdir => "/ssd/nominatim/log",
-    :database => {
-      :cluster => "9.4/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    }
+    :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(
   }
 )
 
 run_list(

-  "role[ic]",
-  "role[nominatim-standalone]"
+  "role[equinix-ams]",
+  "role[nominatim]"

 )
 )