X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d..15c5f64e3607c5d84383af0f8a08137f3fb8a9f6:/roles/naga.rb?ds=inline

diff --git a/roles/naga.rb b/roles/naga.rb
index 5ff6a3588..aa9db6707 100644
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -2,45 +2,47 @@ name "naga"
 description "Master role applied to naga"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "14g"
-  },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "ens18",
-        :role => :external,
-        :family => :inet,
-        :address => "45.13.104.40",
-        :prefix => "32",
-        :gateway => "10.0.4.1"
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.64.8"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
       },
-      :external_ipv6 => {
-        :interface => "ens18",
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet6,
-        :address => "2a0b:cbc0:1101:1::41",
-        :prefix => "64",
-        :gateway => "2a0b:cbc0:1101:1::1"
+        :inet => {
+          :address => "184.104.226.104"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::8"
+        }
       }
     }
-  },
-  :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"
   }
 )
 
 run_list(
-  "role[milkywan]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[subversion]",
+  "role[trac]",
+  "role[irc]",
+  "role[blogs]",
+  "role[munin]",
+  "role[switch2osm]",
+  "recipe[foundation::owg]",
+  "recipe[foundation::welcome]",
+  "recipe[stateofthemap::container]",
+  "recipe[hot]",
+  "recipe[ideditor]"
 )