Drop deprecated Expect-CT header

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index ec2ac08b62bc4e5bd4da7522d649e8584c592aac..0aa526bca6d4a854488d68230f15d3ff50bcf83b 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -2,58 +2,30 @@ name "pummelzacken"
 description "Master role applied to pummelzacken"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :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.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"
+        :address => "193.60.236.18"
       }
     }
-  },
-  :nominatim => {
-    :dbadmins => %w(lonvia tomh),
-    :dbcluster => "9.5/main",
-    :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"
-    },
-    :revision => "cmake-port"
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[nominatim-base]"
+  "role[ucl]"
 )