Tweak logstash expiry

[chef.git] / roles / smaug.rb

diff --git a/roles/smaug.rb b/roles/smaug.rb
index 122c4d3140a46b43c151d023740055546380e732..87daf4d8aa14700678aa06d8766339d23c5e0629 100644 (file)
--- a/roles/smaug.rb
+++ b/roles/smaug.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :apt => {
     }
   },
   :apt => {

-    :sources => [ "brightbox-ruby-ng" ]
+    :sources => ["brightbox-ruby-ng"]

   },
   :db => {
     :cluster => "9.1/main"
   },
   :db => {
     :cluster => "9.1/main"


@@ -22,7 +22,7 @@ default_attributes(
       },
       :sensors_volt => {
         :contacts => "null",
       },
       :sensors_volt => {
         :contacts => "null",

-        :volt10 => { 
+        :volt10 => {

           :warning => "3.11:3.50",
           :critical => "2.98:3.63"
         }
           :warning => "3.11:3.50",
           :critical => "2.98:3.63"
         }


@@ -52,11 +52,11 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",

-      :parameters => { 
+      :parameters => {

         "kernel.shmmax" => 17 * 1024 * 1024 * 1024,
         "kernel.shmall" => 17 * 1024 * 1024 * 1024 / 4096
       }
         "kernel.shmmax" => 17 * 1024 * 1024 * 1024,
         "kernel.shmall" => 17 * 1024 * 1024 * 1024 / 4096
       }

-    },
+    }

   },
   :sysfs => {
     :hdd_tune => {
   },
   :sysfs => {
     :hdd_tune => {


@@ -64,12 +64,12 @@ default_attributes(
       :parameters => {
         "block/sda/queue/nr_requests" => "512",
         "block/sdb/queue/nr_requests" => "512",
       :parameters => {
         "block/sda/queue/nr_requests" => "512",
         "block/sdb/queue/nr_requests" => "512",

-       "block/sda/queue/scheduler" => "noop",
-       "block/sdb/queue/scheduler" => "noop"
+        "block/sda/queue/scheduler" => "noop",
+        "block/sdb/queue/scheduler" => "noop"

       }
     }
   }
       }
     }
   }

-);
+)

 
 run_list(
   "role[ic]",
 
 run_list(
   "role[ic]",