disable db replication between pummelzacken and poldi

[chef.git] / roles / ucl.rb

diff --git a/roles/ucl.rb b/roles/ucl.rb
index e61a04f7dfafd69b06d680ab58efaada2dd5cbd6..2dd44ee70d741166cc08181046523a06a58ec477 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -3,39 +3,14 @@ description "Role applied to all servers at UCL"
 
 default_attributes(
   :bind => {
-    :forwarders => [ "144.82.100.1", "144.82.100.41" ]
+    :forwarders => ["144.82.100.1", "144.82.100.41"]
   },
-  :networking => {
-    :roles => {
-      :internal => {
-        :inet => {
-          :prefix => "20",
-          :gateway => "10.0.0.3"
-        }
-      },
-      :external => {
-        :zone => "ucl",
-        :inet => {
-          :prefix => "24",
-          :gateway => "128.40.168.126"
-        }
-      }
-    }
-  },
-  :sysctl => {
-    :sack => {
-      :comment => "Disable SACK as the UCL firewall breaks it",
-      :parameters => { 
-        "net.ipv4.tcp_sack" => "0"
-      }
-    }
-  }
-
+  :location => "London, England"
 )
 
 override_attributes(
   :ntp => {
-    :servers => [ "ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk" ]
+    :servers => ["ntp1.ucl.ac.uk", "ntp2.ucl.ac.uk"]
   }
 )