Push external network config in Amsterdam down to the hosts

diff --git a/roles/dribble.rb b/roles/dribble.rb
index f40e9dcd8ee5fe45885015a93e3296e7001c7878..bef4322048a226668e81a5c76cfd536b4db481d7 100644 (file)
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.4"
+          :address => "130.117.76.4",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:4"
+          :address => "2001:978:2:2c::172:4",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 5c067440a01091a4b2372fa35beb60fb72c5273e..c7dda68de19476c044d01f6a519f0917a0d83bb1 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.9"
+          :address => "130.117.76.9",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:9"
+          :address => "2001:978:2:2c::172:9",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index fafecd478f3d7bf35f679fc745e825f420edde31..1715e9d470d4db5d7012234d3c21e586280c4af3 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -14,18 +14,7 @@ default_attributes(
         }
       },
       :external => {
-        :zone => "ams",
-        :inet => {
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
+        :zone => "ams"
       }
     }
   },

diff --git a/roles/faffy.rb b/roles/faffy.rb
index 9f0a83552e4d18ff1de472414a7730222a310e4f..4a21fae6100ea7ed1f2257d3259cf0b6a285374c 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.3"
+          :address => "130.117.76.3",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:3"
+          :address => "2001:978:2:2c::172:3",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index aef5e90ae0966c3d121e204ad902849df2798e8f..016ec8200eca112b29240e72de4c172c5a028945 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -43,10 +43,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.10"
+          :address => "130.117.76.10",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:a"
+          :address => "2001:978:2:2c::172:a",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 9985bbda306ebd275d6946dcb81b85bafd67ac9f..b492a92861a5cecf57971a2fecc358e5426e7b1f 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.17"
+          :address => "130.117.76.17",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:11"
+          :address => "2001:978:2:2c::172:11",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/odin.rb b/roles/odin.rb
index a7f836e18fc186bf6b53f6dfe47de3e57001732a..6d29b734c076662f7108610106d4cec4b67f1bea 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.15"
+          :address => "130.117.76.15",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:f"
+          :address => "2001:978:2:2c::172:f",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index 2e93f41a004e639b3fc32ec2bd4b80ef1471cc38..73a3802b16248f5634a32f5c868ae1c431ab7a8e 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.11"
+          :address => "130.117.76.11",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:b"
+          :address => "2001:978:2:2c::172:b",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index dc2a449d3c79ec381bd2e4503025b3ed4ae28dbd..b6a5fc0dae8ede586e4217a2701b4b887c4d9539 100644 (file)
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.12"
+          :address => "130.117.76.12",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:c"
+          :address => "2001:978:2:2c::172:c",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/spike-08.rb b/roles/spike-08.rb
index 836c0f41bc872bda5aae0fdc1fed43062fb69428..c65e0c4c72f328af748e04d8fb8e02fd5d40240e 100644 (file)
--- a/roles/spike-08.rb
+++ b/roles/spike-08.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.13"
+          :address => "130.117.76.13",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:d"
+          :address => "2001:978:2:2c::172:d",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index 304b212db76383d71f2720878e6f46c18ad9e375..75ca73bf01e544d977a48012c153b70bff7f514c 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -21,10 +21,17 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.5"
+          :address => "130.117.76.5",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:5"
+          :address => "2001:978:2:2c::172:5",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
         }
       }
     }