X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c97ab416b812405837e803dd3a4a42c3ef134c1f..b173c492c728598a8ad0e7fcba23fd2a127f6e78:/roles/norbert.rb?ds=sidebyside

diff --git a/roles/norbert.rb b/roles/norbert.rb
index b860ce55e..50b8566ea 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,48 +2,43 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :yellowbkpk => { :status => :administrator },
-      :pnorman => { :status => :user }
-    }
-  },
-  :exim => {
-    :aliases => {
-      :root => "yellowbkpk"
-    }
-  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
+      :internal => {
+        :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.5"
+        :inet => {
+          :address => "10.0.48.17"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp25s0f0 enp25s0f1]
+        }
       },
-      :external_ipv4 => {
-        :interface => "eth1",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "128.40.45.202"
+        :inet => {
+          :address => "184.104.179.145"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::11"
+        }
       }
     }
   },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/cciss\!c0d0/queue/nr_requests" => "512",
-        "block/cciss\!c0d1/queue/nr_requests" => "512",
-	"block/cciss\!c0d0/queue/scheduler" => "noop",
-	"block/cciss\!c0d1/queue/scheduler" => "noop",
-	"block/sda/queue/nr_requests" => "512",
-	"block/sda/queue/scheduler" => "deadline"
-      }
-    }
+  :planet => {
+    :replication => "enabled"
   }
 )
 
 run_list(
-  "role[ucl-wolfson]"
+  "role[equinix-ams]",
+  "role[geodns]",
+  "role[backup]",
+  "role[planet]",
+  "role[planetdump]",
+  "recipe[tilelog]"
 )