Use declare_resource to avoid conflict with "package" property

[chef.git] / roles / smaug.rb

diff --git a/roles/smaug.rb b/roles/smaug.rb
index 9c6d33b05afe3771bf4a387155f06d098e9ac4f7..87daf4d8aa14700678aa06d8766339d23c5e0629 100644 (file)
--- a/roles/smaug.rb
+++ b/roles/smaug.rb
@@ -8,7 +8,7 @@ default_attributes(
     }
   },
   :apt => {
-    :sources => [ "brightbox-ruby-ng" ]
+    :sources => ["brightbox-ruby-ng"]
   },
   :db => {
     :cluster => "9.1/main"
@@ -22,7 +22,7 @@ default_attributes(
       },
       :sensors_volt => {
         :contacts => "null",
-        :volt10 => { 
+        :volt10 => {
           :warning => "3.11:3.50",
           :critical => "2.98:3.63"
         }
@@ -52,11 +52,11 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmmax" => 17 * 1024 * 1024 * 1024,
         "kernel.shmall" => 17 * 1024 * 1024 * 1024 / 4096
       }
-    },
+    }
   },
   :sysfs => {
     :hdd_tune => {
@@ -64,15 +64,14 @@ default_attributes(
       :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]",
-  "role[db-slave]",
-  "role[planetdump]"
+  "role[db-slave]"
 )