Make sure the Passwd ohai plugin is enabled

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

diff --git a/roles/spike-05.rb b/roles/spike-05.rb
index 15f3c374d6aeb78ac313784e0294b8e3b8ffb236..ce41465a875584eda11554fac60638aefc2d8324 100644 (file)
--- a/roles/spike-05.rb
+++ b/roles/spike-05.rb
@@ -10,7 +10,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.22",
         :bond => {
         :family => :inet,
         :address => "10.0.32.22",
         :bond => {

-          :slaves => %w(em1 em2)
+          :slaves => %w[em1 em2]

         }
       },
       :external_ipv4 => {
         }
       },
       :external_ipv4 => {


@@ -26,19 +26,10 @@ default_attributes(
         :address => "2001:41c9:2:d6::22"
       }
     }
         :address => "2001:41c9:2:d6::22"
       }
     }

-  },
-  :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(
   }
 )
 
 run_list(

-  "role[bm]",
+  "role[bytemark]",

   "role[web-frontend]"
 )
   "role[web-frontend]"
 )