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

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

diff --git a/roles/thorn-05.rb b/roles/thorn-05.rb
index 1a0b864f625fefe720be0901d53f9b45ccdcc0a9..b628591111bf2a7b6476cbed41af18adaa1594f2 100644 (file)
--- a/roles/thorn-05.rb
+++ b/roles/thorn-05.rb
@@ -10,23 +10,13 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.42",
         :bond => {
-          :slaves => %w(em1 em2)
+          :slaves => %w[enp3s0f0 enp3s0f1]
         }
       }
     }
-  },
-  :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[web-backend]"
+  "role[bytemark]"
 )