put longma back into production

[chef.git] / roles / konqi.rb

diff --git a/roles/konqi.rb b/roles/konqi.rb
index 017f9de7977762129c619fcc91c510b72c446bad..735f8c1ad941bf775a7bce0b52f6043b8e80dce5 100644 (file)
--- a/roles/konqi.rb
+++ b/roles/konqi.rb
@@ -4,36 +4,35 @@ description "Master role applied to konqi"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,

         :family => :inet,
         :family => :inet,

-        :address => "193.63.75.104"
+        :address => "10.0.64.7",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }

       },
       },

-      :external_ipv4_alias => {
-        :interface => "eth0:1",
+      :external_ipv4 => {
+        :interface => "bond0.101",
+        :role => :external,

         :family => :inet,
         :family => :inet,

-        :address => "193.63.75.105",
-       :prefix => "27"
+        :address => "184.104.226.103"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eth0",
+        :interface => "bond0.101",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2001:630:12:500:215:60ff:feaa:9956"
+        :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(
 run_list(

-  "role[ic]",
-  "role[wiki-old]"
+  "role[equinix-dub]",
+  "role[hp-g9]"

 )
 )