Configure wal_level on database slaves

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 9009c08245aabe597d4c4f1a10caf42ccedaf50a..56e2a3ed3afa845f0fbb727c8e3b5a8c0fb18f43 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -9,33 +9,21 @@ default_attributes(
       :max_spare_threads => 150
     }
   },
       :max_spare_threads => 150
     }
   },

-  :apt => {
-    :sources => ["brightbox-ruby-ng"]
-  },

   :hardware => {
   :hardware => {

-    :mcelog => {
-      :enabled => false
+    :hwmon => {
+      "platform_it87_552" => {
+        :ignore => %w[in6]
+      }

     },
     :modules => [
       "it87"
     ]
     },
     :modules => [
       "it87"
     ]

-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
-    }

   }
 )
 
 override_attributes(
   :networking => {
   }
 )
 
 override_attributes(
   :networking => {

+    :dnssec => "false",

     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",


@@ -59,13 +47,6 @@ override_attributes(
 
 run_list(
   "role[bytemark]",
 
 run_list(
   "role[bytemark]",

-  "role[mail]",

   "role[lists]",
   "role[lists]",

-  "role[subversion]",
-  "role[trac]",
-  "role[osqa]",
-  "role[irc]",
-  "role[geodns]",
-  "recipe[blogs]",
-  "recipe[openvpn]"
+  "role[osqa]"

 )
 )