Make bond configuration more robust

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index ae57f844bf0d85e831a6e4b630edce24b4ecc255..357dc0d5a84b2264b6c4a5591866641871dddd14 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -4,31 +4,30 @@ description "Master role applied to norbert"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.17",
+      :internal => {
+        :inet => {
+          :address => "10.0.48.17"
+        },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet,
-        :address => "130.117.76.17"
+      :henet => {
+        :inet => {
+          :address => "184.104.179.145"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::11"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:11"
+      :equinix => {
+        :inet => {
+          :address => "82.199.86.113"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::11"
+        }
       }
-
     }
   },
   :planet => {
@@ -37,7 +36,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",