Bump cookstyle from 7.25.6 to 7.25.8

[chef.git] / roles / orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index b5e00107ca0b9d74c6a25ac1304f7a4123ae640d..bf2a5ceeaca7bc7aac02b768358562cf3d83c532 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -2,21 +2,7 @@ name "orm"
 description "Master role applied to orm"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :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",
@@ -54,16 +40,6 @@ default_attributes(
       }
     }
   },
-  :postgresql => {
-    :versions => ["9.6"],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
@@ -72,32 +48,10 @@ default_attributes(
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }
-  },
-  :tile => {
-    :database => {
-      :cluster => "9.6/main",
-      :postgis => "2.3"
-    },
-    :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[equinix]",
-  "role[tyan-s7010]",
-  "role[tile]"
+  "role[equinix-ams]",
+  "role[tyan-s7010]"
 )