Add he.net addresses to remaining Amsterdam machines

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index abce74926bbb19d62fc273a556e5e2221d353ccb..b835c456dbc62b4c03439a762952c7282a5fcecd 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -4,11 +4,12 @@ description "Master role applied to odin"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.15",
+        :inet => {
+          :address => "10.0.48.15"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,17 +17,39 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
-      :external_ipv4 => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.15"
+        :source_route_table => 100,
+        :inet => {
+          :address => "130.117.76.15",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:f",
+          :prefix => "64",
+          :gateway => "2001:978:2:2c::172:1",
+          :routes => {
+            "2001:470:1:b3b::/64" => { :type => "unreachable" }
+          }
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:F"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.143",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::f",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },