X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0d6454e0b051f358829a93b72d21f22b0cb9668d..2391778fabfc9e50cef662975c0205bcf0b25a78:/roles/norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index b1981b7ac..7c31bb8f4 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,6 +2,10 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },
   :networking => {
     :interfaces => {
       :internal => {
@@ -17,38 +21,14 @@ default_attributes(
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_cogent => {
-        :interface => "bond0.2",
-        :role => :external,
-        :source_route_table => 100,
-        :inet => {
-          :address => "130.117.76.17",
-          :prefix => "27",
-          :gateway => "130.117.76.1"
-        },
-        :inet6 => {
-          :address => "2001:978:2:2c::172:11",
-          :prefix => "64",
-          :gateway => "2001:978:2:2c::172:1",
-          :routes => {
-            "2001:470:1:b3b::/64" => { :type => "unreachable" }
-          }
-        }
-      },
       :external => {
         :interface => "bond0.3",
         :role => :external,
-        :metric => 150,
-        :source_route_table => 150,
         :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"
         }
       }
     }
@@ -60,9 +40,11 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
+  "role[gateway]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",
+  "recipe[dhcpd]",
   "recipe[tilelog]"
 )