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

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

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index af861755005fd6f910f1453b871d2bfc090b92a2..14f5b3e500d2fd7675b9496c97ae6c7786ebf91e 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -8,38 +8,32 @@ default_attributes(
         :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "10.0.48.6",
+        :address => "10.0.64.3",
         :bond => {
-          :slaves => %w[eth0 eth1]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
       :external_ipv4 => {
-        :interface => "bond0.2",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet,
-        :address => "130.117.76.6"
+        :address => "184.104.226.99"
       },
       :external_ipv6 => {
-        :interface => "bond0.2",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet6,
-        :address => "2001:978:2:2C::172:6"
-      }
-    }
-  },
-  :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:470:1:b3b::3"
       }
     }
   }
 )
 
 run_list(
-  "role[equinix]",
-  "role[hp-dl360-g6]",
-  "role[web-gpximport]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[web-frontend]"
 )