Bump serverspec from 2.41.6 to 2.41.7

[chef.git] / roles / pyrene.rb

diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index f7f36ee769c7b3108f3a4820589b2c9e58a2673d..7d03d02e3ae3b61539abfa3499db5b7c9b3ca672 100644 (file)
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -2,8 +2,23 @@ name "pyrene"
 description "Master role applied to pyrene"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
+  :munin => {
+    :plugins => {
+      :hpasmcli2_temp => {
+        :temp15 => { :warning => "59.5", :critical => "70" },
+        :temp17 => { :warning => "59.5", :critical => "70" }
+      },
+      :hpasmcli2_fans => {
+        :fan1 => { :warning => "95", :critical => "100" },
+        :fan2 => { :warning => "95", :critical => "100" },
+        :fan3 => { :warning => "95", :critical => "100" },
+        :fan4 => { :warning => "95", :critical => "100" },
+        :fan5 => { :warning => "95", :critical => "100" },
+        :fan6 => { :warning => "95", :critical => "100" },
+        :fan7 => { :warning => "95", :critical => "100" },
+        :fan8 => { :warning => "95", :critical => "100" }
+      }
+    }
   },
   :networking => {
     :interfaces => {
@@ -11,14 +26,17 @@ default_attributes(
         :interface => "eno1",
         :role => :external,
         :family => :inet,
-        :address => "140.211.15.29",
-        :prefix => "24",
-        :gateway => "140.211.15.1"
+        :address => "140.211.167.98"
+      },
+      :external_ipv6 => {
+        :interface => "eno1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2605:bc80:3010:700::8cd3:a762"
       }
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -38,10 +56,9 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "12/main",
+      :postgis => "3"
     },
-    :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [