Add host name to munin email subject

[chef.git] / roles / draco.rb

diff --git a/roles/draco.rb b/roles/draco.rb
index 770d8fc968a0e929652ee0655eb3e55461698a04..9bbaddd5c5f919b6518a73e84a8f4576b8ec9ba2 100644 (file)
--- a/roles/draco.rb
+++ b/roles/draco.rb
@@ -2,9 +2,6 @@ name "draco"
 description "Master role applied to draco"
 
 default_attributes(
 description "Master role applied to draco"
 
 default_attributes(

-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {


@@ -24,7 +21,7 @@ default_attributes(
   :sysctl => {
     :tune_cpu_scheduler => {
       :comment => "Tune CPU scheduler for server scheduling",
   :sysctl => {
     :tune_cpu_scheduler => {
       :comment => "Tune CPU scheduler for server scheduling",

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

         "kernel.sched_migration_cost" => 50000000,
         "kernel.sched_autogroup_enabled" => 0
       }
         "kernel.sched_migration_cost" => 50000000,
         "kernel.sched_autogroup_enabled" => 0
       }


@@ -33,5 +30,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-wolfson]"
+  "role[ucl-wolfson]",
+  "role[hp-g5]"

 )
 )