X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/22e1e601087eb94338baafd1adb440a68f481691..96096e070a9d9bb0dfdbcd2c939ef0ffd65273c1:/roles/orm.rb?ds=inline

diff --git a/roles/orm.rb b/roles/orm.rb
index ab2680130..bf2a5ceea 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -3,128 +3,55 @@ description "Master role applied to orm"
 
 default_attributes(
   :devices => {
-    :ssdvol1tune => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "scsi",
-      :sas_address => "0x4433221107000000",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256"
-      }
-    },
-    :ssdvol2tune => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "scsi",
-      :sas_address => "0x4433221104000000",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256"
-      }
-    },
-    :arecavol1tune => {
-      :comment => "Tune scheduler for Areca",
-      :type => "block",
-      :bus => "scsi",
-      :model => "ARC-1680-VOL#000",
-      :attrs => {
-        "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
-      }
-    },
-    :arecavol2tune => {
+    :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",
       :bus => "scsi",
-      :model => "ARC-1680-VOL#001",
+      :serial => "2001b4d20*",
       :attrs => {
         "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
-      }
-    },
-    :arecavol3tune => {
-      :comment => "Tune scheduler for Areca",
-      :type => "block",
-      :bus => "scsi",
-      :model => "ARC-1680-VOL#002",
-      :attrs => {
-        "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
-      }
-    }
-  },
-  :munin => {
-    :plugins => {
-      :ipmi_fans => {
-        :Sys6 => { :graph => "no" },
-        :Sys8 => { :graph => "no" }
-      },
-      :sensors_fan => {
-        :fan3 => { :graph => "no" },
-        :fan4 => { :graph => "no" },
-        :fan5 => { :graph => "no" },
-        :fan6 => { :graph => "no" },
-        :fan7 => { :graph => "no" },
-        :fan8 => { :graph => "no" },
-        :fan9 => { :graph => "no" },
-        :fan10 => { :graph => "no" },
-        :fan11 => { :graph => "no" },
-        :fan12 => { :graph => "no" }
-      },
-      :sensors_volt => {
-        :contacts => "null",
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"
       }
     }
   },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.3",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
+      },
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.98"
+        :address => "130.117.76.3"
       },
       :external_ipv6 => {
-        :interface => "eth0",
+        :interface => "bond0.2",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:2e0:81ff:fec5:2a8c"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => [ "9.1" ],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
+        :address => "2001:978:2:2C::172:3"
       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }
-  },
-  :tile => {
-    :tile_directory => "/store/tiles",
-    :node_file => "/store/database/nodes"
-  }
-)
-
-override_attributes(
-  :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ]
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[tile]"
+  "role[equinix-ams]",
+  "role[tyan-s7010]"
 )