Use empty hash fallback when loading state file in replicate-changesets

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 7c31bb8f497c8c298658349bd9d1335512a19556..ef3d33dbd2303489f4ad947ec278919462e3e45d 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,10 +2,6 @@ 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 => {
@@ -21,14 +17,35 @@ default_attributes(
           :slaves => %w[enp25s0f0 enp25s0f1]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.179.145",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::11",
+          :prefix => 64,
+          :gateway => "2001:470:1:fa1::1"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
         :inet => {
-          :address => "184.104.179.145"
+          :address => "82.199.86.113",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         },
         :inet6 => {
-          :address => "2001:470:1:fa1::11"
+          :address => "2001:4d78:500:5e3::11",
+          :prefix => 64,
+          :gateway => "2001:4d78:500:5e3::1"
         }
       }
     }
@@ -40,11 +57,9 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
-  "role[gateway]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",
-  "recipe[dhcpd]",
   "recipe[tilelog]"
 )