Rework network configuration in Amsterdam to avoid duplication

diff --git a/roles/dribble.rb b/roles/dribble.rb
index 33707cfa495ece91fde969b3eaf0c24322c0b844..75b09f26b8fa437190f085ea2f92dcda3e3ce652 100644 (file)
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.4"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.132",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.132"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::4",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::4"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.100",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.100"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::4",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::4"
         }
       }
     }

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 622b44653c105ccc323777254c9cd1584eb5b692..e754f61be626664afa6a08ee9c32b9b791d173f9 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.9"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp1s0f0 enp1s0f1]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.137",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.137"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::9",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::9"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.105",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.105"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::9",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::9"
         }
       }
     }

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index ac8c6a8850a1241d90d0e88d737cee56082ba98c..1c14a5d9fec82ec92ccdcddc01fc37472b7266ee 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -3,18 +3,52 @@ description "Role applied to all servers at Equinix Amsterdam"
 
 default_attributes(
   :networking => {
-    :roles => {
+    :interfaces => {
       :internal => {
+        :interface => "bond0",
+        :role => :internal,
         :inet => {
           :prefix => "20",
           :gateway => "10.0.48.14",
           :routes => {
             "10.0.0.0/8" => { :via => "10.0.48.14" }
           }
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4"
         }
       },
-      :external => {
-        :zone => "ams"
+      :henet => {
+        :interface => "bond0.3",
+        :role => :external,
+        :zone => "ams",
+        :metric => 150,
+        :source_route_table => 3,
+        :inet => {
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
+      },
+      :equinix => {
+        :interface => "bond0.103",
+        :role => :external,
+        :zone => "ams",
+        :metric => 100,
+        :source_route_table => 103,
+        :inet => {
+          :prefix => "27",
+          :gateway => "82.199.86.97"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2001:4d78:500:5e3::1"
+        }
       }
     }
   },

diff --git a/roles/faffy.rb b/roles/faffy.rb
index 34b4808231abd1f4315ee3c031299761a06b5ba9..95774d0f8f750af0c2c912538772b43e36359006 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.3"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.131",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.131"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::3",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::3"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.99",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.99"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::3",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::3"
         }
       }
     }

diff --git a/roles/karm.rb b/roles/karm.rb
index ac28c48d4f3866a35e7880cb328dd2e9712feed4..bb736d72cff3700376f53d98829a9d12c57c4c26 100644 (file)
--- a/roles/karm.rb
+++ b/roles/karm.rb
@@ -5,15 +5,10 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.50"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[enp1s0f0 enp1s0f1 enp2s0f0 enp2s0f1]
         }
       }

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index bad0a5b7b266eea84cdf0283bbc1d894f2e6429b..8fd06591b05d14c05986bc1546918a6279713cf4 100644 (file)
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.16"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno49 eno50]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.144",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.144"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::10",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::10"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.112",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.112"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::10",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::10"
         }
       }
     }

diff --git a/roles/norbert.rb b/roles/norbert.rb
index ef3d33dbd2303489f4ad947ec278919462e3e45d..32b901afa950a89888cdd8f08b3058b60a02caad 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -5,47 +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_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.145",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.145"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::11",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::11"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.113",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.113"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::11",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::11"
         }
       }
     }

diff --git a/roles/odin.rb b/roles/odin.rb
index 1544fb9b347c029283bd518790bec7505abbc4ee..178fd97dbd8fc292bd6eccdb4cbadee37f0b6796 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.15"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1np0 eno2np1]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.143",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.143"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::f",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::f"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.111",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.111"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::f",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::f"
         }
       }
     }

diff --git a/roles/snap-01.rb b/roles/snap-01.rb
index d7fb452a5b52d14da2aa4576a1552f7129768180..e741e2d51a45f3a3bb4ab39bf0acc3ea709ed5e0 100644 (file)
--- a/roles/snap-01.rb
+++ b/roles/snap-01.rb
@@ -5,15 +5,10 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.49"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4]
         }
       }

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index dd754a7ba45baa83a5660aec60ac386ca47a29c1..d7f3b35a31c0b3759293e7a58d155caaa88447a0 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.6"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.134",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.134"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::6",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::6"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.102",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.102"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::6",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::6"
         }
       }
     }

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index f9d0d8f12b458829ebfae37ddbd18141e4e87505..47649fa8bda8fa8cae87937c1df8e87ea476bfdd 100644 (file)
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.7"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.135",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.135"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::7",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::7"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.103",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.103"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::7",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::7"
         }
       }
     }

diff --git a/roles/spike-08.rb b/roles/spike-08.rb
index c462603404aafe3057949b16671a59b2991bd22f..f1e667fa551270e5a1f2d43037f475f54870e875 100644 (file)
--- a/roles/spike-08.rb
+++ b/roles/spike-08.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.8"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.136",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.136"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::8",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::8"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.104",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.104"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::8",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::8"
         }
       }
     }

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index af8492b83120b541d61037a0b7cf9ee67004b11a..569aa774023e6003d3555ce18500688712ad0fc9 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -9,47 +9,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.14"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.142",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.142"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::e",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::e"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.110",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.110"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::e",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::e"
         }
       }
     }

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index b5776ab2ad41c8c79dca5add4e32b380e546da1a..f79dbb6f3f91b8af7665a2c9cba7731887b52abf 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -5,47 +5,27 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal => {
-        :interface => "bond0",
-        :role => :internal,
         :inet => {
           :address => "10.0.48.5"
         },
         :bond => {
-          :mode => "802.3ad",
-          :lacprate => "fast",
-          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_he => {
-        :interface => "bond0.3",
-        :role => :external,
-        :metric => 150,
-        :source_route_table => 100,
+      :henet => {
         :inet => {
-          :address => "184.104.179.133",
-          :prefix => "27",
-          :gateway => "184.104.179.129"
+          :address => "184.104.179.133"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::5",
-          :prefix => 64,
-          :gateway => "2001:470:1:fa1::1"
+          :address => "2001:470:1:fa1::5"
         }
       },
-      :external => {
-        :interface => "bond0.103",
-        :role => :external,
-        :source_route_table => 150,
+      :equinix => {
         :inet => {
-          :address => "82.199.86.101",
-          :prefix => "27",
-          :gateway => "82.199.86.97"
+          :address => "82.199.86.101"
         },
         :inet6 => {
-          :address => "2001:4d78:500:5e3::5",
-          :prefix => 64,
-          :gateway => "2001:4d78:500:5e3::1"
+          :address => "2001:4d78:500:5e3::5"
         }
       }
     }