Avoid double call to ip2region; consolidate rewrite conditions

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index 749be40e21faf8d122bc096313da1e11155cd91a..c34fe2f531e8f9d810223067eb539c1708c9d3e6 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -4,31 +4,33 @@ description "Master role applied to grisu"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "em1",
-        :role => :external,
-        :family => :inet,
-        :address => "193.63.75.108",
-        :hwaddress => "d8:d3:85:5d:87:a0"
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.64.17"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
+        }
       },
-      :external_ipv6 => {
-        :interface => "em1",
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:630:12:500:dad3:85ff:fe5d:87a0"
-      },
-      :internal_ipv4 => {
-        :interface => "em2",
-        :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.168",
-        :hwaddress => "d8:d3:85:5d:87:a1"
+        :inet => {
+          :address => "184.104.226.113"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::11"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[ic]",
-  "role[hp-dl180-g6]"
+  "role[equinix-dub]"
 )