Add host name to munin email subject

[chef.git] / roles / grindtooth.rb

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index 7fc2daea98ee2ce2e7126eefad34c36a094652cc..b4d07fdc6703d88129ef2f59b87619fd903c1489 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -2,11 +2,6 @@ name "grindtooth"
 description "Master role applied to grindtooth"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :jochen => { :status => :administrator }
-    }
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -14,11 +9,19 @@ default_attributes(
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.19"
+      },
+      :external_ipv4 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet,
+        :address => "128.40.45.199"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-internal]"
+  "role[ucl-wolfson]",
+  "role[hp-g6]",
+  "role[taginfo]"
 )