Move Dublin hosts to use interface inheritance for network configuration

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 4b1fbcea6cf1c4fff0ad8361b8ada91d93acc770..2ef8ebd84b9da563fafb9c77978fee33138c1c37 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.7"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.103",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.103"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::7",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::7"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.103",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.103"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::7",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::7"
         }
       }
     }
@@ -53,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[wiki]"
 )