Merge remote-tracking branch 'github/pull/579'

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index c57441b1149a6adc62090b4c8a93d40d302b3552..56e2a3ed3afa845f0fbb727c8e3b5a8c0fb18f43 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -15,9 +15,6 @@ default_attributes(
         :ignore => %w[in6]
       }
     },
-    :mcelog => {
-      :enabled => false
-    },
     :modules => [
       "it87"
     ]
@@ -44,15 +41,12 @@ override_attributes(
         :prefix => "64",
         :gateway => "fe80::1"
       }
-    },
-    :nameservers => ["89.16.162.20", "2001:41c9:2:d6::20"],
-    :private_address => "10.0.16.100"
+    }
   }
 )
 
 run_list(
   "role[bytemark]",
-  "role[mail]",
   "role[lists]",
   "role[osqa]"
 )