Revert "Force Enable TCP MTU probing @ UCL"

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 5d69d4a222c23ae6b7bc806c347973366369acb1..f20cf2ec89b69b1d105f66e185f006c5a8dd5531 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -2,31 +2,38 @@ name "ascalon"
 description "Master role applied to ascalon"
 
 default_attributes(
 description "Master role applied to ascalon"
 
 default_attributes(

+  :hardware => {
+    :shm_size => "20g"
+  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.18"
-      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "eth1.2800",
+        :interface => "eno1",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.60.236.10"
+        :address => "184.107.48.228",
+        :prefix => "27",
+        :gateway => "184.107.48.225"

       }
     }
   },
       }
     }
   },

-  :accounts => {
-    :users => {
-      :emacsen => { :status => :administrator }
-    }
+  :squid => {
+    :version => 4,
+    :cache_mem => "16384 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
+  },
+  :tilecache => {
+    :tile_parent => "montreal.render.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl-slough]",
-  "role[hp-g5]",
-  "role[roundup]"
+  "role[netalerts]",
+  "role[geodns]",
+  "role[tilecache]"

 )
 )