Simplify loop index where arithmetic isn't needed.

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index b172ce06648d9724cfd4b11aff3d8a87d06b8eab..e1b21e67d7203a0e4ecbcbc0a5e027ea703017cf 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -9,35 +9,48 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"

+      },
+      :external_ipv4 => {
+        :interface => "em2",
+        :role => :external,
+        :family => :inet,
+        :address => "128.40.45.204"

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

+    :versions => ["9.3"],

     :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"

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

-    :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "10"
-        }
+    :flatnode_file => "/ssd/nominatim/nodes.store",
+    :database => {
+      :cluster => "9.3/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"
+    },
+    :redirects => {
+    }
+  },
+  :hardware => {
+    :grub => {
+      # lock kernel to 3.16.0-46 due to some issue with igb driver
+      # see https://github.com/openstreetmap/operations/issues/45
+      # for more information.
+      :kernel => "3.16.0-46"

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[ucl-internal]",
-  "role[nominatim]"
+  "role[ucl-wolfson]",
+  "role[nominatim-standalone]"

 )
 )