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

[chef.git] / roles / thorn-04.rb

diff --git a/roles/thorn-04.rb b/roles/thorn-04.rb
index 7422f152062e8ac928b6136db1d145ae3282fe50..7afcfb3be2cb7a1d5d6033576ba8e57855747362 100644 (file)
--- a/roles/thorn-04.rb
+++ b/roles/thorn-04.rb
@@ -10,23 +10,14 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.41",
         :bond => {
-          :slaves => %w(em1 em2)
+          :slaves => %w[em1 em2]
         }
       }
     }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.bond0.autoconf" => "0",
-        "net.ipv6.conf.bond0.accept_ra" => "0"
-      }
-    }
   }
 )
 
 run_list(
-  "role[bm]",
+  "role[bytemark]",
   "role[web-backend]"
 )