Make sure tile cookbook only requests the required postgres version

[chef.git] / roles / rhaegal.rb

diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 6d0b126c30154f761bff5c00a1cf4302661c62fe..cda8a602f1714df37db58bc4b525933a6ac3d226 100644 (file)
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -7,25 +7,26 @@ default_attributes(
       :mmiler => { :status => :administrator }
     }
   },
       :mmiler => { :status => :administrator }
     }
   },

-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :devices => {
-    :ssd_samsung => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "ata",
-      :serial => "Samsung_SSD_860_PRO_*",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
+  :location => "Zagreb, Croatia",
+  :munin => {
+    :plugins => {
+      :sensors_temp => {
+        :temp1 => { :warning => "85.0" },
+        :temp2 => { :warning => "85.0" },
+        :temp3 => { :warning => "85.0" },
+        :temp4 => { :warning => "85.0" },
+        :temp5 => { :warning => "85.0" },
+        :temp6 => { :warning => "85.0" },
+        :temp8 => { :warning => "85.0" },
+        :temp9 => { :warning => "85.0" },
+        :temp10 => { :warning => "85.0" },
+        :temp11 => { :warning => "85.0" },
+        :temp12 => { :warning => "85.0" },
+        :temp13 => { :warning => "85.0" }

       }
     }
   },
       }
     }
   },

-  :location => "Zagreb, Croatia",

   :networking => {
   :networking => {

-    :netplan => true,

     :interfaces => {
       :external_ipv4 => {
         :interface => "enp1s0f0",
     :interfaces => {
       :external_ipv4 => {
         :interface => "enp1s0f0",


@@ -43,7 +44,6 @@ default_attributes(
     ]
   },
   :postgresql => {
     ]
   },
   :postgresql => {

-    :versions => ["10"],

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


@@ -66,7 +66,6 @@ default_attributes(
       :cluster => "10/main",
       :postgis => "2.4"
     },
       :cluster => "10/main",
       :postgis => "2.4"
     },

-    :node_file => "/store/database/nodes",

     :styles => {
       :default => {
         :tile_directories => [
     :styles => {
       :default => {
         :tile_directories => [