Remove geodns role from machines which aren't acting as geodns servers

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 87b9ca26c7a637d95260421e9a0fc43cae6276c0..9cd93e053b7cbedcf23da576ff7686fdb41e0b81 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -2,29 +2,37 @@ name "ascalon"
 description "Master role applied to ascalon"
 
 default_attributes(
+  :hardware => {
+    :shm_size => "20g"
+  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.18"
-      },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eno1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.105"
+        :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(
-  "role[ucl-internal]"
+  "role[netalerts]",
+  "role[tilecache]"
 )