Update IP addresses for move from Imperial to Amsterdam

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index b172ce06648d9724cfd4b11aff3d8a87d06b8eab..59853cc0d26322c1ca7bd343642d90fcd91d1e22 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -5,39 +5,54 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "em1",
+        :interface => "em1.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"

+      },
+      :external_ipv4 => {
+        :interface => "em1.2800",
+        :role => :external,
+        :family => :inet,
+        :address => "193.60.236.18"

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

+    :versions => ["9.6"],

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

-        :shared_buffers => "24GB",
+        :listen_addresses => "10.0.0.20",

         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",

-        :effective_cache_size => "48GB"
+        :effective_cache_size => "60GB",
+        :fsync => "on"

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

-    :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "10"
-        }
+    :state => "standalone",
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "9.6/main",
+    :enable_backup => true,
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :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" => "/data/tablespaces/daux",
+      "iaux" => "/data/tablespaces/iaux"

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[ucl-internal]",
+  "role[ucl]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )