X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d6ee422a3f48f53ba3ffe99fa86d905dc8d2b245..b36599d7d102e864b89c65986fa0945a931628cc:/roles/ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 7d703858f..8d3d997df 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,9 +2,6 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
-  :bind => {
-    :clients => "equinix-ams"
-  },
   :dhcpd => {
     :first_address => "10.0.63.1",
     :last_address => "10.0.63.254"
@@ -29,11 +26,12 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.10",
+        :inet => {
+          :address => "10.0.48.10"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -41,23 +39,42 @@ default_attributes(
           :slaves => %w[eth0 eth1]
         }
       },
-      :external_ipv4 => {
+      :external_cogent => {
         :interface => "bond0.2",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.10"
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "130.117.76.10",
+          :prefix => "27",
+          :gateway => "130.117.76.1"
+        },
+        :inet6 => {
+          :address => "2001:978:2:2c::172:a",
+          :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:A"
+        :source_route_table => 150,
+        :inet => {
+          :address => "184.104.179.138",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::a",
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
       }
     }
   },
-  :planet => {
-    :replication => "enabled"
-  },
   :prometheus => {
     :snmp => {
       "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
@@ -67,7 +84,7 @@ default_attributes(
     :metrics => {
       :uplink_interface => {
         :help => "Site uplink interface name",
-        :labels => { :site => "amsterdam", :name => "ge-[01]/2/0" }
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/0|ae60" }
       }
     }
   },
@@ -85,8 +102,10 @@ default_attributes(
         :hosts_allow => [
           "193.60.236.0/24",          # ucl external
           "10.0.48.0/20",             # amsterdam internal
-          "130.117.76.0/27",          # amsterdam external
-          "2001:978:2:2C::172:0/112", # amsterdam external
+          "130.117.76.0/27",          # amsterdam external (cogent)
+          "2001:978:2:2c::172:0/112", # amsterdam external (cogent)
+          "184.104.179.128/27",       # amsterdam external (he)
+          "2001:470:1:fa1::/64",      # amsterdam external (he)
           "10.0.64.0/20",             # dublin internal
           "184.104.226.96/27",        # dublin external
           "2001:470:1:b3b::/64",      # dublin external
@@ -104,9 +123,6 @@ default_attributes(
 run_list(
   "role[equinix-ams]",
   "role[gateway]",
-  "role[supybot]",
-  "role[planet]",
   "recipe[rsyncd]",
-  "recipe[dhcpd]",
-  "recipe[tilelog]"
+  "recipe[dhcpd]"
 )