Correct over aggressive search and replace

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 9fc103d9e791b6391e2cbe568d91a12e4ef2819e..e0264e9d01b0a8cbb904062fd4c1d3ba24aa411d 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -5,35 +5,36 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

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

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {

-        :interface => "em2",
+        :interface => "em1.2800",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.45.204"
+        :address => "193.60.236.18"

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

-    :versions => ["9.5"],
+    :versions => ["9.6"],

     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",

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

       }
     }
   },
   :nominatim => {
     :state => "standalone",
       }
     }
   },
   :nominatim => {
     :state => "standalone",

-    :dbadmins => %w(lonvia tomh),
-    :dbcluster => "9.5/main",
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "9.6/main",

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",


@@ -46,12 +47,11 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"

-    },
-    :revision => "cmake-port"
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl-wolfson]",
-  "role[nominatim-base]"
+  "role[ucl]",
+  "role[nominatim]"

 )
 )