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

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 8c09f2dbd02b188935622d44d78d901f4caa9a3c..4026bcac7e0ec874c1153b8935c559f60666c874 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -2,37 +2,49 @@ name "naga"
 description "Master role applied to naga"
 
 default_attributes(
-  :hardware => {
-    :shm_size => "38g"
-  },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "eth0",
+      :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 => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "185.116.130.151",
-        :prefix => "24",
-        :gateway => "185.116.130.151"
+        :inet => {
+          :address => "184.104.226.104"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::8"
+        }
       }
     }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "32768 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[fullsave]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[subversion]",
+  "role[trac]",
+  "role[irc]",
+  "role[blogs]",
+  "role[switch2osm]",
+  "recipe[foundation::mastodon]",
+  "recipe[foundation::owg]",
+  "recipe[foundation::welcome]",
+  "recipe[stateofthemap::container]",
+  "recipe[hot]",
+  "recipe[ideditor]",
+  "recipe[dmca]",
+  "role[otrs]"
 )