X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1169bcdd70e501162b05d3ee7882ec5b101f721d..59baf108f689be6bf6258f2acbf50c7ff41dc2ac:/roles/naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 280afe21e..aa9db6707 100644
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -4,11 +4,12 @@ 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",
@@ -16,17 +17,15 @@ default_attributes(
           :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"
+        }
       }
     }
   }
@@ -39,5 +38,11 @@ run_list(
   "role[trac]",
   "role[irc]",
   "role[blogs]",
-  "role[munin]"
+  "role[munin]",
+  "role[switch2osm]",
+  "recipe[foundation::owg]",
+  "recipe[foundation::welcome]",
+  "recipe[stateofthemap::container]",
+  "recipe[hot]",
+  "recipe[ideditor]"
 )