Move OSUOSL hosts to use interface inheritance for network configuration

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 66140ee604137666d475003a0f67ac24a461d27d..357dc0d5a84b2264b6c4a5591866641871dddd14 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -5,50 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.17"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "130.117.76.17",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
+          :address => "184.104.179.145"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:11",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
+          :address => "2001:470:1:fa1::11"
         }
       },
-      :external => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "184.104.179.139",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "82.199.86.113"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::11",
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:4d78:500:5e3::11"
         }
       }
     }
@@ -59,7 +36,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
+  "role[equinix-ams-public]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",