X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2a08c44df56c77ce9e8eabc88a87668c18991bcb..c954aeff2861e3c9fcd8e236f08a2b15f4a00202:/roles/pummelzacken.rb?ds=sidebyside

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index cae7b6562..0aa526bca 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -4,69 +4,28 @@ description "Master role applied to pummelzacken"
 default_attributes(
   :networking => {
     :interfaces => {
+      :bond => {
+        :interface => "bond0",
+        :bond => {
+          :slaves => %w[eno1 enp5s0f0]
+        }
+      },
       :internal_ipv4 => {
-        :interface => "em1",
+        :interface => "bond0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
-        :interface => "em2",
+        :interface => "bond0.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.204"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => ["9.3"],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "10GB",
-        :work_mem => "160MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
-        :fsync => "on"
-      }
-    }
-  },
-  :nominatim => {
-    :enabled => true,
-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :database => {
-      :cluster => "9.3/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "70"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
+        :address => "193.60.236.18"
       }
-    },
-    :tablespaces => {
-      "Osm2pgsql_Data" => "ssd",
-      "Osm2pgsql_Index" => "ssd",
-      "Place_Data" => "ssd",
-      "Place_Index" => "ssd",
-      "Address_Data" => "ssd",
-      "Address_Index" => "ssd",
-      "Search_Data" => "ssd",
-      "Search_Index" => "ssd",
-      "Aux_Data" => "data",
-      "Aux_Index" => "ssd"
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[nominatim]"
+  "role[ucl]"
 )