Merge interface families

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 368eaf366b351d32ca4117ef9921129d44f277f8..dfded54c3a07cc66121e00811c09cb6c15e8a7c5 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -4,39 +4,35 @@ description "Master role applied to spike-02"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
+      :internal => {
+        :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.163",
-        :hwaddress => "00:1b:78:04:76:c0"
+        :inet => {
+          :address => "10.0.64.4"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
       },
-      :external_ipv4 => {
-        :interface => "eth1",
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "193.63.75.100",
-        :hwaddress => "00:1b:78:04:a5:5a"
-      },
-      :external_ipv6 => {
-        :interface => "eth1",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:630:12:500:219:bbff:fe39:3d9e",
-        :hwaddress => "00:1b:78:04:a5:5a"
+        :inet => {
+          :address => "184.104.226.100"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::4"
+        }
       }
     }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => { "net.ipv6.conf.eth0.autoconf" => "0" }
-    }
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-dl360-g6]",
+  "role[equinix-dub]",
+  "role[hp-g9]",
   "role[web-frontend]"
 )