Rework network configuration in Amsterdam to avoid duplication

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 1544fb9b347c029283bd518790bec7505abbc4ee..178fd97dbd8fc292bd6eccdb4cbadee37f0b6796 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.15"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1np0 eno2np1]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.143",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.143"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::f",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::f"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.111",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.111"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::f",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::f"
         }
       }
     }