Add IPv6 addresses to dulcy

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index e69ea39ddbfaf839621ab181be369dc0ab0d2770..d9d8fb79f4a1636d973e4ed4cb70c521ddaa1e27 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -14,23 +14,44 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",

-          :slaves => %w[ens18f0 ens18f1]
+          :slaves => %w[enp1s0f0 enp1s0f1]

         }
       },
         }
       },

-      :external => {
+      :external_he => {

         :interface => "bond0.3",
         :role => :external,
         :interface => "bond0.3",
         :role => :external,

+        :metric => 150,
+        :source_route_table => 100,

         :inet => {
         :inet => {

-          :address => "184.104.179.137"
+          :address => "184.104.179.137",
+          :prefix => "27",
+          :gateway => "184.104.179.129"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:fa1::9"
+          :address => "2001:470:1:fa1::9",
+          :prefix => 64,
+          :gateway => "2001:470:1:fa1::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.105",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::9",
+          :prefix => 64,
+          :gateway => "2001:4d78:500:5e3::1"

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

-    :versions => ["15"],
+    :versions => ["17"],

     :settings => {
       :defaults => {
         :work_mem => "240MB",
     :settings => {
       :defaults => {
         :work_mem => "240MB",


@@ -39,17 +60,11 @@ default_attributes(
     }
   },
   :nominatim => {
     }
   },
   :nominatim => {

-    :state => "standalone",
-    :dbcluster => "15/main",
-    :postgis => "3",
-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :logdir => "/ssd/nominatim/log",
-    :api_flavour => "python",
+    :dbcluster => "17/main",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :enable_qa_tiles => true,

     :api_workers => 14,
     :api_workers => 14,

-    :api_pool_size => 10,
-    :config => {
-      :forward_dependencies => "yes"
-    }
+    :api_pool_size => 10

   }
 )
 
   }
 )