Only apply the geodns role to machines that need it

[chef.git] / roles / grindtooth.rb

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index cf9538ed1bb6501827e32770e99c8ef90c76a1c3..d6636294ce77660f3936854fc19477b32f8739be 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -5,13 +5,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "em1",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.19"
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "em2",
         :role => :external,
         :family => :inet,
         :address => "128.40.45.199"
@@ -22,6 +22,6 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
-  "role[hp-g5]",
+  "role[hp-dl360-g6]",
   "role[taginfo]"
 )