civicrm: upgrade membershipextra to correct revision

[chef.git] / roles / necrosan.rb

diff --git a/roles/necrosan.rb b/roles/necrosan.rb
index 9d86e7d2d168482e0c2889902bf4bbf911732c09..c113f451a78092a36696ef8be2016d3b5f06993c 100644 (file)
--- a/roles/necrosan.rb
+++ b/roles/necrosan.rb
@@ -2,45 +2,41 @@ name "necrosan"
 description "Master role applied to necrosan"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "12g"
-  },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "ens18",
-        :role => :external,
-        :family => :inet,
-        :address => "80.67.167.77",
-        :prefix => "32",
-        :gateway => "10.0.6.1"
-      },
-      :external_ipv6 => {
-        :interface => "ens18",
+      :external => {
+        :interface => "bond0",
+        :mtu => 9000,
         :role => :external,
-        :family => :inet6,
-        :address => "2a0b:cbc0:110d:1::1c",
-        :prefix => "64",
-        :gateway => "2a0b:cbc0:110d:1::1"
+        :inet => {
+          :address => "45.85.134.91",
+          :prefix => "31",
+          :gateway => "45.85.134.90"
+        },
+        :inet6 => {
+          :address => "2a05:46c0:100:1004:ffff:ffff:ffff:ffff",
+          :prefix => "64",
+          :gateway => "2a05:46c0:100:1004::"
+        },
+        :bond => {
+          :slaves => %w[eno1 eno2],
+          :mode => "802.3ad",
+          :lacprate => "fast"
+        }
       }
     }
   },
-  :squid => {
-    :version => 4,
-    :cache_mem => "10240 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 => "france.render.openstreetmap.org"
+  :sysfs => {
+    :hdd_tune => {
+      :comment => "Tune the queue for improved performance",
+      :parameters => {
+        "block/sda/queue/nr_requests" => "975",
+        "block/sdb/queue/rotational" => "0"
+      }
+    }
   }
 )
 
 run_list(
-  "role[milkywan]",
-  "role[tilecache]"
+  "role[appliwave]"
 )