Remove redundant config for disabling IPv6 autoconf

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

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 7ac4eceaead3a90d995efe0fb12544328c0d732a..628a3935d1476c11b6def3b40d4e3aeb8e453ed8 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -5,44 +5,32 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.162",
-        :hwaddress => "00:1a:4b:a5:0f:ca"
+        :address => "10.0.48.6",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.99",
-        :hwaddress => "00:1a:4b:a5:fd:2a"
+        :address => "130.117.76.6"
       },
       :external_ipv6 => {
-        :interface => "eth1",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:21a:4bff:fea5:fd2a",
-        :hwaddress => "00:1a:4b:a5:fd:2a"
-      }
-    }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.eth0.autoconf" => "0",
-        "net.ipv6.conf.eth0.accept_ra" => "0"
+        :address => "2001:978:2:2C::172:6"
       }
     }
   }
 )
 
 run_list(
-  "role[ic]",
+  "role[equinix]",
   "role[hp-dl360-g6]",
-  "role[web-frontend]",
-  "role[web-gpximport]",
-  "role[web-statistics]",
-  "role[web-cleanup]"
+  "role[web-gpximport]"
 )