Set xmithashpolicy for Dublin machines

[chef.git] / roles / fafnir.rb

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index d8e6b5b5082aeb8d9afd756bc52a0b758c0ff417..1e19617f9c3e866756e0f8928cbefd7553a7147b 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -2,61 +2,47 @@ name "fafnir"
 description "Master role applied to fafnir"
 
 default_attributes(
 description "Master role applied to fafnir"
 
 default_attributes(

-  :db => {
-    :cluster => "9.1/main"
+  :bind => {
+    :clients => "equinix-dub"
+  },
+  :dhcpd => {
+    :first_address => "10.0.79.1",
+    :last_address => "10.0.79.254"

   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

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

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

-        :address => "172.31.10.210",
-        :hwaddress => "02:c1:c5:8b:5f:1d"
+        :address => "10.0.64.2",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }

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

+        :interface => "bond0.101",

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

-        :address => "52.50.86.69"
-      }
-    }
-  },
-  :openvpn => {
-    :address => "10.0.16.4",
-    :tunnels => {
-      :aws2ic => {
-        :port => "1194",
-        :mode => "client",
-        :peer => {
-          :host => "ironbelly.openstreetmap.org",
-          :port => "1195"
-        }
-      }
-    }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "64GB",
-        :work_mem => "64MB",
-        :maintenance_work_mem => "1GB",
-        :effective_cache_size => "180GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 66 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 66 * 1024 * 1024 * 1024 / 4096
+        :address => "184.104.226.98"
+      },
+      :external_ipv6 => {
+        :interface => "bond0.101",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:470:1:b3b::2"

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

-  "role[aws]",
-  "role[db-slave]",
-  "recipe[openvpn]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[gateway]",
+  "role[web-storage]",
+  "recipe[dhcpd]"

 )
 )