Update errol to chef 12

[chef.git] / roles / errol.rb

diff --git a/roles/errol.rb b/roles/errol.rb
index efb7b93b4e5ee076ed299fc064c9d3bd833e9dab..a2665803657aca4d958a2629f830cd2239f8f4c4 100644 (file)
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -2,21 +2,9 @@ name "errol"
 description "Master role applied to errol"
 
 default_attributes(
 description "Master role applied to errol"
 
 default_attributes(

-  :munin => {
-    :plugins => {
-      :sensors_fan => {
-        :contacts => "null"
-      },
-      :sensors_temp => {
-        :contacts => "null"
-      },
-      :sensors_volt => {
-        :contacts => "null",
-        :volt10 => { 
-          :warning => "3.11:3.50",
-          :critical => "2.98:3.63"
-        }
-      }
+  :chef => {
+    :client => {
+      :version => "12.1.2-1"

     }
   },
   :devices => {
     }
   },
   :devices => {


@@ -53,13 +41,14 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
         :interface => "eth1",
         :role => :external,
         :family => :inet,

-        :address => "128.40.168.103"
+        :address => "128.40.45.196"

       }
     }
   }
       }
     }
   }

-);
+)

 
 run_list(
 
 run_list(

-  "role[ucl-external]",
+  "role[ucl-wolfson]",
+  "role[tyan-s7010]",

   "role[dev]"
 )
   "role[dev]"
 )