Merge remote-tracking branch 'github/pull/703'

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 65105bafb68aff33a410cbeaec63bd112ebe794a..b23841de21f8a159eacd06ddee4e1d678149d4b3 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -4,35 +4,35 @@ description "Master role applied to konqi"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "193.63.75.104"
-      },
-      :external_ipv4_alias => {
-        :interface => "eth0:1",
-        :family => :inet,
-        :address => "193.63.75.105",
-       :prefix => "27"
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.64.7"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
       },
-      :external_ipv6 => {
-        :interface => "eth0",
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:630:12:500:215:60ff:feaa:9956"
+        :inet => {
+          :address => "184.104.226.103"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::7"
+        }
       }
     }
   }
 )
 
-override_attributes(
-  :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
-    :search => [ "ic.openstreetmap.org", "openstreetmap.org" ],
-  }
-)
-
 run_list(
-  "role[ic]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[wiki]"
 )