Move OSUOSL hosts to use interface inheritance for network configuration

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index aa9db6707817c3355cd6e04e0f15a33e9ed24511..1bcf3c1765816a18cdda6aee7acec7c057430940 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -5,44 +5,48 @@ default_attributes(
   :networking => {
     :interfaces => {
       :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,
+      :henet => {
         :inet => {
           :address => "184.104.226.104"
         },
         :inet6 => {
           :address => "2001:470:1:b3b::8"
         }
+      },
+      :equinix => {
+        :inet => {
+          :address => "87.252.214.104"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::8"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix-dub]",
+  "role[equinix-dub-public]",
   "role[hp-g9]",
   "role[subversion]",
   "role[trac]",
   "role[irc]",
   "role[blogs]",
-  "role[munin]",
   "role[switch2osm]",
+  "recipe[foundation::birthday]",
+  "recipe[foundation::mastodon]",
   "recipe[foundation::owg]",
   "recipe[foundation::welcome]",
   "recipe[stateofthemap::container]",
   "recipe[hot]",
-  "recipe[ideditor]"
+  "recipe[ideditor]",
+  "recipe[dmca]",
+  "role[otrs]"
 )