X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b616d843b86c3f6897eea08b3b96bb26eee06488..0f3c8bcea70957f08be052ac87316438666c95b7:/roles/naga.rb?ds=inline

diff --git a/roles/naga.rb b/roles/naga.rb
index 2d8ff8868..aa9db6707 100644
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -4,28 +4,28 @@ description "Master role applied to naga"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.64.8",
+        :inet => {
+          :address => "10.0.64.8"
+        },
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "184.104.226.104"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.101",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:470:1:b3b::8"
+        :inet => {
+          :address => "184.104.226.104"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::8"
+        }
       }
     }
   }
@@ -33,5 +33,16 @@ default_attributes(
 
 run_list(
   "role[equinix-dub]",
-  "role[hp-g9]"
+  "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]"
 )