Merge duplicate hash entries

[chef.git] / roles / idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index f25b3246a5c093bcfa58ba49a0b5f9bbb65a65ea..b13469623f593b811d9839bad4d21a6407879184 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -14,32 +14,12 @@ default_attributes(
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.98"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => [ "9.1" ],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "1GB",
-        :maintenance_work_mem => "256MB",
-        :effective_cache_size => "2GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => { 
-        "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
+        :address => "128.40.45.200"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
-  "role[tile]"
+  "role[ucl-wolfson]"
 )