X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3c8f0b1687fec4ec84893d3f78f08843df0832f3..974d2ff3a3ff7f13d26667972fb2ab802f76e826:/roles/orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index a44ffd143..860ab8c3d 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -2,21 +2,7 @@ name "orm"
 description "Master role applied to orm"
 
 default_attributes(
-  :apt => {
-    :sources => ["ubuntugis-stable"]
-  },
   :devices => {
-    :ssd_samsung => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "ata",
-      :serial => "Samsung_SSD_840_PRO_Series_*",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
-      }
-    },
     :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",
@@ -31,27 +17,26 @@ default_attributes(
   },
   :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"
       }
     }
   },
@@ -63,28 +48,10 @@ default_attributes(
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }
-  },
-  :tile => {
-    :node_file => "/store/database/nodes",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 },
-          { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }
-        ]
-      }
-    }
-  }
-)
-
-override_attributes(
-  :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"]
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[tyan-s7010]",
-  "role[tile]"
+  "role[equinix]",
+  "role[tyan-s7010]"
 )