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 7c31bb8f497c8c298658349bd9d1335512a19556..357dc0d5a84b2264b6c4a5591866641871dddd14 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,34 +2,31 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
-  :dhcpd => {
-    :first_address => "10.0.63.1",
-    :last_address => "10.0.63.254"
-  },
   :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 => {
-        :interface => "bond0.3",
-        :role => :external,
+      :henet => {
         :inet => {
           :address => "184.104.179.145"
         },
         :inet6 => {
           :address => "2001:470:1:fa1::11"
         }
+      },
+      :equinix => {
+        :inet => {
+          :address => "82.199.86.113"
+        },
+        :inet6 => {
+          :address => "2001:4d78:500:5e3::11"
+        }
       }
     }
   },
@@ -39,12 +36,10 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-ams]",
-  "role[gateway]",
+  "role[equinix-ams-public]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",
-  "recipe[dhcpd]",
   "recipe[tilelog]"
 )