Merge remote-tracking branch 'github/pull/467'

[chef.git] / roles / ramoth.rb

diff --git a/roles/ramoth.rb b/roles/ramoth.rb
index c8a12c518749118e9be42ed6b73dcea6dba7f374..5507fd3c3cbed68be32e9e2e84bcceaf72d8903d 100644 (file)
--- a/roles/ramoth.rb
+++ b/roles/ramoth.rb
@@ -2,12 +2,6 @@ name "ramoth"
 description "Master role applied to ramoth"
 
 default_attributes(
 description "Master role applied to ramoth"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :db => {
-    :cluster => "9.5/main"
-  },

   :devices => {
     :store_openstreetmap => {
       :comment => "RAID array mounted on /store/postgresql/openstreetmap",
   :devices => {
     :store_openstreetmap => {
       :comment => "RAID array mounted on /store/postgresql/openstreetmap",


@@ -55,29 +49,9 @@ default_attributes(
         }
       }
     }
         }
       }
     }

-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "64GB",
-        :work_mem => "64MB",
-        :maintenance_work_mem => "1GB",
-        :effective_cache_size => "180GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 66 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
-      }
-    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[equinix]",
-  "role[db-slave]"
+  "role[equinix-ams]"

 )
 )