X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21db602c8d3b29da17982aa8786a8ee1e1562d9c..2391778fabfc9e50cef662975c0205bcf0b25a78:/roles/norbert.rb?ds=inline

diff --git a/roles/norbert.rb b/roles/norbert.rb
index ae57f844b..7c31bb8f4 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,13 +2,18 @@ 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_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.17",
+        :inet => {
+          :address => "10.0.48.17"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
@@ -16,19 +21,16 @@ default_attributes(
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet,
-        :address => "130.117.76.17"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:11"
+        :inet => {
+          :address => "184.104.179.145"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::11"
+        }
       }
-
     }
   },
   :planet => {
@@ -38,9 +40,11 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
+  "role[gateway]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",
+  "recipe[dhcpd]",
   "recipe[tilelog]"
 )