Avoid double call to ip2region; consolidate rewrite conditions

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index b260ff89598a47378c113f16da012ce30e93e48e..c34fe2f531e8f9d810223067eb539c1708c9d3e6 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -2,45 +2,35 @@ name "grisu"
 description "Master role applied to grisu"
 
 default_attributes(
-  :bind => {
-    :clients => "bytemark"
-  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.32.20",
+        :inet => {
+          :address => "10.0.64.17"
+        },
         :bond => {
-          :slaves => %w[enp2s0f0 enp2s0f1]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.214",
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "89.16.162.20"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.214",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:41c9:2:d6::20"
+        :inet => {
+          :address => "184.104.226.113"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::11"
+        }
       }
     }
-  },
-  :planet => {
-    :replication => "disabled"
   }
 )
 
 run_list(
-  "role[bytemark]",
-  "role[hp-dl180-g6]",
-  "role[gateway]",
-  "role[web-storage]",
-  "role[backup]",
-  "role[planet]"
-  # "role[planetdump]"
+  "role[equinix-dub]"
 )