Switch nidhogg, ridgeback and rimfaxe to squid 4

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

diff --git a/roles/spike-04.rb b/roles/spike-04.rb
index 343a5c59141bc277ba097a158d207d4a287404bd..bc2e53f7500aa4f68bf881ae4bb8261a156f87e7 100644 (file)
--- a/roles/spike-04.rb
+++ b/roles/spike-04.rb
@@ -10,7 +10,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.32.21",
         :bond => {
-          :slaves => %w(em1 em2)
+          :slaves => %w[em1 em2]
         }
       },
       :external_ipv4 => {
@@ -26,21 +26,12 @@ default_attributes(
         :address => "2001:41c9:2:d6::21"
       }
     }
-  },
-  :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[bytemark]",
-  "role[web-frontend]",
+  "role[web-frontend]"
   # "role[web-gpximport]",
   # "role[web-statistics]",
   # "role[web-cleanup]"