Merge interface families

[chef.git] / roles / smaug.rb

diff --git a/roles/smaug.rb b/roles/smaug.rb
index 122c4d3140a46b43c151d023740055546380e732..fd747471439445457def9c813998e7b94246e424 100644 (file)
--- a/roles/smaug.rb
+++ b/roles/smaug.rb
@@ -2,76 +2,36 @@ name "smaug"
 description "Master role applied to smaug"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :gravitystorm => { :status => :user }
-    }
-  },
-  :apt => {
-    :sources => [ "brightbox-ruby-ng" ]
-  },
-  :db => {
-    :cluster => "9.1/main"
-  },
-  :munin => {
-    :plugins => {
-      :ipmi_fans => {
-        :Fan4 => { :graph => "no" },
-        :Fan7CPU1 => { :graph => "no" },
-        :Fan8CPU2 => { :graph => "no" }
-      },
-      :sensors_volt => {
-        :contacts => "null",
-        :volt10 => { 
-          :warning => "3.11:3.50",
-          :critical => "2.98:3.63"
-        }
-      }
-    }
-  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
+      :internal => {
+        :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.168"
-      }
-    }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :shared_buffers => "16GB",
-        :work_mem => "32MB",
-        :maintenance_work_mem => "512MB",
-        :effective_cache_size => "45GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => { 
-        "kernel.shmmax" => 17 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 17 * 1024 * 1024 * 1024 / 4096
-      }
-    },
-  },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/sda/queue/nr_requests" => "512",
-        "block/sdb/queue/nr_requests" => "512",
-       "block/sda/queue/scheduler" => "noop",
-       "block/sdb/queue/scheduler" => "noop"
+        :inet => {
+          :address => "10.0.64.14"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
+        }
+      },
+      :external => {
+        :interface => "bond0.101",
+        :role => :external,
+        :inet => {
+          :address => "184.104.226.110"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::e"
+        }
       }
     }
   }
-);
+)
 
 run_list(
-  "role[ic]",
-  "role[db-slave]"
+  "role[equinix-dub]",
+  "role[matomo]"
 )