Use supybot's preferred ordering for channels.conf

[chef.git] / roles / idris.rb

diff --git a/roles/idris.rb b/roles/idris.rb
index f25b3246a5c093bcfa58ba49a0b5f9bbb65a65ea..aec768e827a90b17094528710c7ecff931014b3a 100644 (file)
--- a/roles/idris.rb
+++ b/roles/idris.rb
@@ -5,41 +5,34 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

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

         :role => :internal,
         :family => :inet,
         :role => :internal,
         :family => :inet,

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

       },
       :external_ipv4 => {
       },
       :external_ipv4 => {

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

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "128.40.168.98"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => [ "9.1" ],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "1GB",
-        :maintenance_work_mem => "256MB",
-        :effective_cache_size => "2GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => { 
-        "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
+        :address => "184.104.226.102"
+      },
+      :external_ipv6 => {
+        :interface => "bond0.101",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:470:1:b3b::6"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ucl-internal]",
-  "role[tile]"
+  "role[equinix-dub]",
+  "role[hp-g9]"

 )
 )