Allow some extra apache processes to account for graceful termination

[chef.git] / roles / idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index abe3d606f4cbc38b362043d3ec7b3735241b05ef..aec768e827a90b17094528710c7ecff931014b3a 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -2,52 +2,37 @@ name "idris"
 description "Master role applied to idris"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "20g"
-  },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.6",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
+      },
       :external_ipv4 => {
-        :interface => "ens160",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet,
-        :address => "200.25.60.195",
-        :prefix => "27",
-        :gateway => "200.25.60.193"
+        :address => "184.104.226.102"
       },
       :external_ipv6 => {
-        :interface => "ens160",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet6,
-        :address => "2800:1e0:1030::64",
-        :prefix => "123",
-        :gateway => "2800:1e0:1030::61"
-      }
-    }
-  },
-  :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"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "8192M"
+        :address => "2001:470:1:b3b::6"
       }
     }
-  },
-  :tilecache => {
-    :tile_parent => "buenosaires.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[edgeuno-ar]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-g9]"
 )