Merge remote-tracking branch 'github/pull/697'

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 1ab77bb8f4ec3b04f772b05c6e6638b28cc978f8..50b8566ea36aa8fbfeefb1efb7443cba9898c2a1 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,52 +2,43 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "14g"
-  },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "ens18",
-        :role => :external,
-        :family => :inet,
-        :address => "89.234.186.100",
-        :prefix => "27",
-        :gateway => "89.234.186.97"
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.48.17"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp25s0f0 enp25s0f1]
+        }
       },
-      :external_ipv6 => {
-        :interface => "ens18",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet6,
-        :address => "2a00:5884:821c::1",
-        :prefix => "48",
-        :gateway => "fe80::204:92:100:1"
-      }
-    }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "12288 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :max_size => "2048M"
+        :inet => {
+          :address => "184.104.179.145"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::11"
+        }
       }
     }
   },
-  :tilecache => {
-    :tile_parent => "france.render.openstreetmap.org"
+  :planet => {
+    :replication => "enabled"
   }
 )
 
 run_list(
-  "role[grifon]",
-  "role[tilecache]"
+  "role[equinix-ams]",
+  "role[geodns]",
+  "role[backup]",
+  "role[planet]",
+  "role[planetdump]",
+  "recipe[tilelog]"
 )