Avoid double call to ip2region; consolidate rewrite conditions

[chef.git] / roles / idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index 372aba8cb91ce4badafb6836d3a3dce2d25cbe8f..0a7f593ab0e80f3b7163e61e907969b4ef5bbba3 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -4,23 +4,42 @@ description "Master role applied to idris"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
+      :internal => {
+        :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.4"
+        :inet => {
+          :address => "10.0.64.6"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
       },
-      :external_ipv4 => {
-        :interface => "eth1",
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "128.40.45.200"
+        :inet => {
+          :address => "184.104.226.102"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::6"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[hp-g5]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[chef-server]",
+  "role[chef-repository]",
+  "role[dns]",
+  "role[git]",
+  "role[letsencrypt]",
+  "role[oxidized]",
+  "role[supybot]",
+  "recipe[serverinfo]"
 )