Move Dublin hosts to use interface inheritance for network configuration

[chef.git] / roles / longma.rb

diff --git a/roles/longma.rb b/roles/longma.rb
index b8bf00af1d950861ec0aac1b72cc290f1e4e883f..b64af9aa41ca0f141a624715270da501b68b3690 100644 (file)
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
   :networking => {
     :interfaces => {
       :internal => {

-        :interface => "bond0",
-        :role => :internal,

         :inet => {
           :address => "10.0.64.13"
         },
         :bond => {
         :inet => {
           :address => "10.0.64.13"
         },
         :bond => {

-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",

           :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3]
         }
       },
           :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3]
         }
       },

-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {

         :inet => {
         :inet => {

-          :address => "184.104.226.109",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.109"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:470:1:b3b::d",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::d"

         }
       },
         }
       },

-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {

         :inet => {
         :inet => {

-          :address => "87.252.214.109",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.109"

         },
         :inet6 => {
         },
         :inet6 => {

-          :address => "2001:4d78:fe03:1c::d",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::d"

         }
       }
     }
         }
       }
     }


@@ -70,6 +50,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-dub]",
+  "role[equinix-dub-public]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )