Merge remote-tracking branch 'github/pull/464'

[chef.git] / roles / pyrene.rb

diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index 8b51e658c1762c00bfca56cf88f5dde85d956888..2d9c8dbfc87c9f5e42cf708e8f0391746abdbf2f 100644 (file)
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -2,14 +2,21 @@ name "pyrene"
 description "Master role applied to pyrene"
 
 default_attributes(
 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" }
   :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" }

       }
     }
   },
       }
     }
   },


@@ -19,20 +26,17 @@ default_attributes(
         :interface => "eno1",
         :role => :external,
         :family => :inet,
         :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,
       },
       :external_ipv6 => {
         :interface => "eno1",
         :role => :external,
         :family => :inet6,

-        :address => "2605:bc80:3010:700::8cd3:0f1d"
+        :address => "2605:bc80:3010:700::8cd3:a762"

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

-    :versions => ["10"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -52,16 +56,20 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "12/main",
+      :postgis => "3"

     },
     },

-    :node_file => "/store/database/nodes",
+    :mapnik => "3.1",

     :styles => {
       :default => {
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
       }
     :styles => {
       :default => {
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
       }

+    },
+    :ratelimit => {
+      :requests_per_second => 30,
+      :maximum_backlog => 3600

     }
   }
 )
     }
   }
 )