Move Dublin hosts to use interface inheritance for network configuration

diff --git a/roles/culebre.rb b/roles/culebre.rb
index d798bddaecc0c34f4b682499047d1bd2b8c9f243..8f266566a93071ae12b55c70fbb50c437e06da03 100644 (file)
--- a/roles/culebre.rb
+++ b/roles/culebre.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.9"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.105",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.105"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::9",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::9"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.105",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.105"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::9",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::9"
         }
       }
     }
@@ -83,6 +63,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[tile]"
 )

diff --git a/roles/equinix-dub-public.rb b/roles/equinix-dub-public.rb
new file mode 100644 (file)
index 0000000..e00975a
--- /dev/null
+++ b/roles/equinix-dub-public.rb
@@ -0,0 +1,51 @@
+name "equinix-dub-public"
+description "Role applied to all public servers at Equinix Dublin"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :henet => {
+        :interface => "bond0.101",
+        :role => :external,
+        :zone => "dub",
+        :metric => 150,
+        :source_route_table => 101,
+        :inet => {
+          :prefix => "27",
+          :gateway => "184.104.226.97",
+          :rules => [
+            { :to => "10.0.0.0/8", :table => "main", :priority => 50 },
+            { :to => "172.16.0.0/12", :table => "main", :priority => 50 },
+            { :to => "192.168.0.0/16", :table => "main", :priority => 50 }
+          ]
+        },
+        :inet6 => {
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1",
+          :rules => [
+            { :to => "2600:9000::/28", :table => 150, :priority => 100 }
+          ]
+        }
+      },
+      :equinix => {
+        :interface => "bond0.203",
+        :role => :external,
+        :zone => "dub",
+        :metric => 100,
+        :source_route_table => 203,
+        :inet => {
+          :prefix => "27",
+          :gateway => "87.252.214.97"
+        },
+        :inet6 => {
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
+        }
+      }
+    }
+  }
+)
+
+run_list(
+  "role[equinix-dub]"
+)

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index 9652c2c8c19485bc2f13b304f2da5204706cb99a..716f0ff7c5026513df2266add6b4bf11bfc89cbe 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -12,29 +12,22 @@ default_attributes(
     }
   },
   :networking => {
-    :roles => {
+    :interfaces => {
       :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :metric => 200,
         :inet => {
           :prefix => "20",
           :gateway => "10.0.64.2",
           :routes => {
             "10.0.0.0/8" => { :via => "10.0.64.2" }
           }
-        }
-      },
-      :external => {
-        :zone => "dub",
-        :inet => {
-          :rules => [
-            { :to => "10.0.0.0/8", :table => "main", :priority => 50 },
-            { :to => "172.16.0.0/12", :table => "main", :priority => 50 },
-            { :to => "192.168.0.0/16", :table => "main", :priority => 50 }
-          ]
         },
-        :inet6 => {
-          :rules => [
-            { :to => "2600:9000::/28", :table => 150, :priority => 100 }
-          ]
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4"
         }
       }
     }

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index 7ca7094bc505779dd581478f7edfd388a8a83c73..e7edc263cdc3fbb94cb17c4d4c6be28b2059b3c2 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -19,47 +19,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.2"
         },
         :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.98",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.98"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::2",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::2"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.98",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.98"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::2",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::2"
         }
       }
     }
@@ -82,7 +62,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[gateway]",
   "role[mail]",

diff --git a/roles/fume.rb b/roles/fume.rb
index 5cc06a4b144a5ad4aba76f0c765f86465a162642..af951e1f047d42e3d4fcc496f5500c51d95ef752 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.16"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.112",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.112"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::10",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::10"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.112",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.112"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::10",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::10"
         }
       }
     }
@@ -53,6 +33,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[community]"
 )

diff --git a/roles/grisu.rb b/roles/grisu.rb
index 525e028d213792ec02adbb5f82fbf3f3fc271dbc..e7fd2f899b3a3d817a7c4585d68e4bf4711c02b3 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.17"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.113",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.113"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::11",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::11"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.113",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.113"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::11",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::11"
         }
       }
     }
@@ -53,6 +33,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[overpass-query]"
 )

diff --git a/roles/horntail.rb b/roles/horntail.rb
index d071856f41047fd80210dd088cf18afd885885ba..b09bf796bf7360ae27c3519399d5fa8260535474 100644 (file)
--- a/roles/horntail.rb
+++ b/roles/horntail.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.10"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.106",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.106"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::a",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::a"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.106",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.106"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::a",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::a"
         }
       }
     }
@@ -53,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[geodns]",
   "role[planet]"
 )

diff --git a/roles/idris.rb b/roles/idris.rb
index 7467f67af03f498ec8fdbf744859d40bddb96389..2a91aaf733c66723db6b92a93042c41642dbf9b1 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.6"
         },
         :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.102",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.102"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::6",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::6"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.102",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.102"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::6",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::6"
         }
       }
     }
@@ -53,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[chef-server]",
   "role[chef-repository]",

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]"
 )

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 => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.13"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.109",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.109"
         },
         :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 => {
-          :address => "87.252.214.109",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.109"
         },
         :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(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[nominatim]"
 )

diff --git a/roles/muirdris.rb b/roles/muirdris.rb
index b77e4f8df859371857bf90a458fa1371e5692c7b..a2c578567cf35272c17cdb8bfb66e7dff7b0ebb6 100644 (file)
--- a/roles/muirdris.rb
+++ b/roles/muirdris.rb
@@ -8,47 +8,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.15"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.111",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.111"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::f",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::f"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.111",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.111"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::f",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::f"
         }
       }
     }
@@ -56,6 +36,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[gps-tile]"
 )

diff --git a/roles/naga.rb b/roles/naga.rb
index 5bb605112f523604d056d298c299781ccb79fe7a..1bcf3c1765816a18cdda6aee7acec7c057430940 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.8"
         },
         :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.104",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.104"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::8",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::8"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.104",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.104"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::8",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::8"
         }
       }
     }
@@ -53,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[subversion]",
   "role[trac]",

diff --git a/roles/smaug.rb b/roles/smaug.rb
index 4156fcb9903d5a7a5be8a933de5832bfb90b19ed..7d42c4f6ef84d812419865ca637709ddb5255da5 100644 (file)
--- a/roles/smaug.rb
+++ b/roles/smaug.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.14"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.101",
-        :role => :external,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.226.110",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.110"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::e",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::e"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.110",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.110"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::e",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::e"
         }
       }
     }
@@ -53,6 +33,6 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[matomo]"
 )

diff --git a/roles/snap-03.rb b/roles/snap-03.rb
index 4956bdab7a6e0c16d9ae859279b63a7db92269ec..0164f8563c3e5b9bee46ee04a6d964820b5a89d5 100644 (file)
--- a/roles/snap-03.rb
+++ b/roles/snap-03.rb
@@ -5,15 +5,10 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.50"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp25s0f0np0 enp25s0f1np1]
         }
       }

diff --git a/roles/spike-01.rb b/roles/spike-01.rb
index 80b56c5e1e7a9f416417ddb1efcdbb150d6a6445..51ff42c631d189da2b5dbf0b5fbf5d64782a19a1 100644 (file)
--- a/roles/spike-01.rb
+++ b/roles/spike-01.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.3"
         },
         :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.99",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.99"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::3",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::3"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.99",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.99"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::3",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::3"
         }
       }
     }
@@ -53,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[web-frontend]"
 )

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 065be3faf0232baaa8c7535ec671149299a2fa4b..4e178bdec3f011b97f5d206311ae95351a773abf 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.64.4"
         },
         :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.100",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.100"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::4",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::4"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.100",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.100"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::4",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::4"
         }
       }
     }
@@ -53,7 +33,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[web-frontend]"
 )

diff --git a/roles/spike-03.rb b/roles/spike-03.rb
index b620aecfc95f692171c720e9fcdba1b47cb19af0..a24512eaa2349e3751097746fba2936c7286302c 100644 (file)
--- a/roles/spike-03.rb
+++ b/roles/spike-03.rb
@@ -5,47 +5,28 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
         :role => :internal,
         :inet => {
           :address => "10.0.64.5"
         },
         :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.101",
-          :prefix => "27",
-          :gateway => "184.104.226.97"
+          :address => "184.104.226.101"
         },
         :inet6 => {
-          :address => "2001:470:1:b3b::5",
-          :prefix => 64,
-          :gateway => "2001:470:1:b3b::1"
+          :address => "2001:470:1:b3b::5"
         }
       },
-      :external => {
-        :interface => "bond0.203",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "87.252.214.101",
-          :prefix => "27",
-          :gateway => "87.252.214.97"
+          :address => "87.252.214.101"
         },
         :inet6 => {
-          :address => "2001:4d78:fe03:1c::5",
-          :prefix => 64,
-          :gateway => "2001:4d78:fe03:1c::1"
+          :address => "2001:4d78:fe03:1c::5"
         }
       }
     }
@@ -53,7 +34,7 @@ default_attributes(
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[web-frontend]"
 )