geodns: enable include_optional_ns to please picky DNS servers

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

diff --git a/roles/spike-04.rb b/roles/spike-04.rb
index 4936947656672a5e9bed427e7b46ca794b474e06..bc2e53f7500aa4f68bf881ae4bb8261a156f87e7 100644 (file)
--- a/roles/spike-04.rb
+++ b/roles/spike-04.rb
@@ -26,21 +26,12 @@ default_attributes(
         :address => "2001:41c9:2:d6::21"
       }
     }
         :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]",
   }
 )
 
 run_list(
   "role[bytemark]",

-  "role[web-frontend]",
+  "role[web-frontend]"

   # "role[web-gpximport]",
   # "role[web-statistics]",
   # "role[web-cleanup]"
   # "role[web-gpximport]",
   # "role[web-statistics]",
   # "role[web-cleanup]"